On 04/30/2015 07:32 PM, Christoph Hellwig wrote: > Stop building scsi_dh as a separate module and integrate it fully into the > core SCSI code with explicit callouts at bus scan time. For now the > callouts are placed at the same point as the old bus notifiers were called, > but in the future we will be able to look at ALUA INQUIRY data earlier on. > > Note that this also means that the device handler modules need to be loaded > by the time we scan the bus. The next patches will add support for > autoloading device handlers at bus scan time to make sure they are always > loaded if they are enabled in the kernel config. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- > drivers/scsi/Makefile | 1 + > drivers/scsi/device_handler/Kconfig | 2 +- > drivers/scsi/device_handler/Makefile | 1 - > drivers/scsi/device_handler/scsi_dh.c | 185 +++------------------------------- > drivers/scsi/scsi_priv.h | 9 ++ > drivers/scsi/scsi_sysfs.c | 10 ++ > include/scsi/scsi_dh.h | 2 +- > 7 files changed, 35 insertions(+), 175 deletions(-) > > diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile > index dee160a..df2f656 100644 > --- a/drivers/scsi/Makefile > +++ b/drivers/scsi/Makefile > @@ -169,6 +169,7 @@ scsi_mod-$(CONFIG_SYSCTL) += scsi_sysctl.o > scsi_mod-$(CONFIG_SCSI_PROC_FS) += scsi_proc.o > scsi_mod-y += scsi_trace.o scsi_logging.o > scsi_mod-$(CONFIG_PM) += scsi_pm.o > +scsi_mod-$(CONFIG_SCSI_DH) += device_handler/scsi_dh.o > > hv_storvsc-y := storvsc_drv.o > > diff --git a/drivers/scsi/device_handler/Kconfig b/drivers/scsi/device_handler/Kconfig > index 69abd0a..e5647d5 100644 > --- a/drivers/scsi/device_handler/Kconfig > +++ b/drivers/scsi/device_handler/Kconfig > @@ -3,7 +3,7 @@ > # > > menuconfig SCSI_DH > - tristate "SCSI Device Handlers" > + bool "SCSI Device Handlers" > depends on SCSI > default n > help > diff --git a/drivers/scsi/device_handler/Makefile b/drivers/scsi/device_handler/Makefile > index e1d2ea0..09866c5 100644 > --- a/drivers/scsi/device_handler/Makefile > +++ b/drivers/scsi/device_handler/Makefile > @@ -1,7 +1,6 @@ > # > # SCSI Device Handler > # > -obj-$(CONFIG_SCSI_DH) += scsi_dh.o > obj-$(CONFIG_SCSI_DH_RDAC) += scsi_dh_rdac.o > obj-$(CONFIG_SCSI_DH_HP_SW) += scsi_dh_hp_sw.o > obj-$(CONFIG_SCSI_DH_EMC) += scsi_dh_emc.o > diff --git a/drivers/scsi/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c > index e6ed565..cb336a4 100644 > --- a/drivers/scsi/device_handler/scsi_dh.c > +++ b/drivers/scsi/device_handler/scsi_dh.c > @@ -24,7 +24,7 @@ > #include <linux/slab.h> > #include <linux/module.h> > #include <scsi/scsi_dh.h> > -#include "../scsi_priv.h" > +#include "scsi_priv.h" > This doesn't compile; 'scsi_dh' is still at it's old location. Please remove this hunk. Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage hare@xxxxxxx +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
