diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-08-27 14:16:57 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-08-28 13:14:56 -0700 |
| commit | 086b91d052ebe4ead5d28021afe3bdfd70af15bf (patch) | |
| tree | f168084b13c2fbf924f45567c7b749962eff5f4d /include/scsi | |
| parent | daaa858b7a6bb497f11c2aae555053b9c047824b (diff) | |
| download | linux-086b91d052ebe4ead5d28021afe3bdfd70af15bf.tar.gz linux-086b91d052ebe4ead5d28021afe3bdfd70af15bf.tar.bz2 linux-086b91d052ebe4ead5d28021afe3bdfd70af15bf.zip | |
scsi_dh: integrate into the core SCSI code
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@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_dh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi_dh.h b/include/scsi/scsi_dh.h index 966b921135b5..3a37b4c45997 100644 --- a/include/scsi/scsi_dh.h +++ b/include/scsi/scsi_dh.h @@ -55,7 +55,7 @@ enum { SCSI_DH_NOSYS, SCSI_DH_DRIVER_MAX, }; -#if defined(CONFIG_SCSI_DH) || defined(CONFIG_SCSI_DH_MODULE) +#ifdef CONFIG_SCSI_DH extern int scsi_dh_activate(struct request_queue *, activate_complete, void *); extern int scsi_dh_attach(struct request_queue *, const char *); extern const char *scsi_dh_attached_handler_name(struct request_queue *, gfp_t); |