Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fac829fdcaf451a20106cbc468ff886466320956

Authored by James Bottomley
1 parent 98e1e0f07c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SCSI] raid_attrs: fix dependency problems 

RAID attributes uses scsi_is_sdev_device() to gate some SCSI specific
checking code.  This causes two problems.  Firstly if SCSI == n just
defining scsi_is_sdev_device() to return false might not be enough to
prevent gcc from emitting the code (and thus referring to undefined
symbols), so this needs surrounding with an ifdef.  Secondly, using
scsi_is_sdev_device() when SCSI is either y or m gives a subtle
problem in the m case: raid_attrs must also be m to use the symbol.
Do the usual Kconfig jiggery-pokery to fix this.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

Showing 2 changed files with 8 additions and 0 deletions Side-by-side Diff

drivers/scsi/Kconfig
Diff comments   View file @ fac829f
1 1 menu "SCSI device support"
2 2  
  3 +config SCSI_MOD
  4 + tristate
  5 + default y if SCSI=n || SCSI=y
  6 + default m if SCSI=m
  7 +
3 8 config RAID_ATTRS
4 9 tristate "RAID Transport Class"
5 10 default n
6 11 depends on BLOCK
  12 + depends on SCSI_MOD
7 13 ---help---
8 14 Provides RAID
9 15  
drivers/scsi/raid_class.c
Diff comments   View file @ fac829f
... ... @@ -63,6 +63,7 @@
63 63 * emulated RAID devices, so start with SCSI */
64 64 struct raid_internal *i = ac_to_raid_internal(cont);
65 65  
  66 +#if defined(CONFIG_SCSI) || defined(CONFIG_SCSI_MODULE)
66 67 if (scsi_is_sdev_device(dev)) {
67 68 struct scsi_device *sdev = to_scsi_device(dev);
68 69  
... ... @@ -71,6 +72,7 @@
71 72  
72 73 return i->f->is_raid(dev);
73 74 }
  75 +#endif
74 76 /* FIXME: look at other subsystems too */
75 77 return 0;
76 78 }