lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] scsi_dh: fix kconfig related build errors

Browse Source 
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>
This commit is contained in:
Chandra Seetharaman
2008-05-23 18:16:40 -07:00
committed by James Bottomley
parent d7f305e9a0
commit fe9233fb69
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/md/Kconfig
View File

@@ -252,7 +252,11 @@ config DM_ZERO
config DM_MULTIPATH config DM_MULTIPATH
tristate "Multipath target" tristate "Multipath target"
depends on BLK_DEV_DM depends on BLK_DEV_DM
select SCSI_DH # nasty syntax but means make DM_MULTIPATH independent
# of SCSI_DH if the latter isn't defined but if
# it is, DM_MULTIPATH must depend on it. We get a build
# error if SCSI_DH=m and DM_MULTIPATH=y
depends on SCSI_DH || !SCSI_DH
---help--- ---help---
Allow volume managers to support multipath hardware. Allow volume managers to support multipath hardware.

2
drivers/md/dm-mpath.c
View File

@@ -664,6 +664,8 @@ static int parse_hw_handler(struct arg_set *as, struct multipath *m)
request_module("scsi_dh_%s", m->hw_handler_name); request_module("scsi_dh_%s", m->hw_handler_name);
if (scsi_dh_handler_exist(m->hw_handler_name) == 0) { if (scsi_dh_handler_exist(m->hw_handler_name) == 0) {
ti->error = "unknown hardware handler type"; ti->error = "unknown hardware handler type";
kfree(m->hw_handler_name);
m->hw_handler_name = NULL;
return -EINVAL; return -EINVAL;
} }
consume(as, hw_argc - 1); consume(as, hw_argc - 1);

12
include/scsi/scsi_dh.h
View File

@@ -54,6 +54,16 @@ enum {
SCSI_DH_NOSYS, SCSI_DH_NOSYS,
SCSI_DH_DRIVER_MAX, 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_activate(struct request_queue *);
extern int scsi_dh_handler_exist(const char *); 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