summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorChandra Seetharaman <sekharan@us.ibm.com>2008-05-23 18:16:40 -0700
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-07-15 09:16:43 -0500
commitfe9233fb6914a0eb20166c967e3020f7f0fba2c9 (patch)
tree45d6f25301e41ff9323f2eee20fce6ae341cda7f /include/scsi
parentd7f305e9a08040649b0800245e67708df58cdb55 (diff)
downloadblackbird-op-linux-fe9233fb6914a0eb20166c967e3020f7f0fba2c9.tar.gz
blackbird-op-linux-fe9233fb6914a0eb20166c967e3020f7f0fba2c9.zip
[SCSI] scsi_dh: fix kconfig related build errors
Do not automatically "select" SCSI_DH for dm-multipath. If SCSI_DH doesn't exist,just do not allow hardware handlers to be used. Handle SCSI_DH being a module also. Make sure it doesn't allow DM_MULTIPATH to be compiled in when SCSI_DH is a module. [jejb: added comment for Kconfig syntax] Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com> Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Reported-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_dh.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/scsi/scsi_dh.h b/include/scsi/scsi_dh.h
index 04d0d8495c83..3ad2303d1a16 100644
--- a/include/scsi/scsi_dh.h
+++ b/include/scsi/scsi_dh.h
@@ -54,6 +54,16 @@ enum {
SCSI_DH_NOSYS,
SCSI_DH_DRIVER_MAX,
};
-
+#if defined(CONFIG_SCSI_DH) || defined(CONFIG_SCSI_DH_MODULE)
extern int scsi_dh_activate(struct request_queue *);
extern int scsi_dh_handler_exist(const char *);
+#else
+static inline int scsi_dh_activate(struct request_queue *req)
+{
+ return 0;
+}
+static inline int scsi_dh_handler_exist(const char *name)
+{
+ return 0;
+}
+#endif
OpenPOWER on IntegriCloud