[PATCH 1/1] cciss: include scsi/scsi.h unconditionally

[PATCH 1/1] cciss: include scsi/scsi.h unconditionally

[Stephen Cameron]

Make cciss unconditionally include scsi/scsi.h

From: Stephen M. Cameron <steve.cameron@hp.com>
Signed-off-by: Stephen M. Cameron <steve.cameron@hp.com>

---

 drivers/block/cciss.c      |    1 +
 drivers/block/cciss_scsi.c |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/block/cciss.c~include_scsi_h_unconditionally drivers/block/cciss.c
--- linux-2.6.21-rc6/drivers/block/cciss.c~include_scsi_h_unconditionally	2007-04-13 08:23:07.000000000 -0500
+++ linux-2.6.21-rc6-scameron/drivers/block/cciss.c	2007-04-13 08:25:05.000000000 -0500
@@ -45,6 +45,7 @@
 #include <linux/blkdev.h>
 #include <linux/genhd.h>
 #include <linux/completion.h>
+#include <scsi/scsi.h>
 #include <scsi/sg.h>
 #include <scsi/scsi_ioctl.h>
 #include <linux/cdrom.h>
diff -puN drivers/block/cciss_scsi.c~include_scsi_h_unconditionally drivers/block/cciss_scsi.c
--- linux-2.6.21-rc6/drivers/block/cciss_scsi.c~include_scsi_h_unconditionally	2007-04-13 08:23:53.000000000 -0500
+++ linux-2.6.21-rc6-scameron/drivers/block/cciss_scsi.c	2007-04-13 08:24:34.000000000 -0500
@@ -35,7 +35,6 @@
 
 #include <asm/atomic.h>
 
-#include <scsi/scsi.h> 
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h> 
_

Re: [PATCH 1/1] cciss: include scsi/scsi.h unconditionally

[Andrew Morton]

On Fri, 13 Apr 2007 09:23:12 -0500
Stephen Cameron <steve.cameron@hp.com> wrote:

> Make cciss unconditionally include scsi/scsi.h

For what reason?

> 
> From: Stephen M. Cameron <steve.cameron@hp.com>
> Signed-off-by: Stephen M. Cameron <steve.cameron@hp.com>
> 
> ---
> 
>  drivers/block/cciss.c      |    1 +
>  drivers/block/cciss_scsi.c |    1 -
>  2 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff -puN drivers/block/cciss.c~include_scsi_h_unconditionally drivers/block/cciss.c
> --- linux-2.6.21-rc6/drivers/block/cciss.c~include_scsi_h_unconditionally	2007-04-13 08:23:07.000000000 -0500
> +++ linux-2.6.21-rc6-scameron/drivers/block/cciss.c	2007-04-13 08:25:05.000000000 -0500
> @@ -45,6 +45,7 @@
>  #include <linux/blkdev.h>
>  #include <linux/genhd.h>
>  #include <linux/completion.h>
> +#include <scsi/scsi.h>
>  #include <scsi/sg.h>
>  #include <scsi/scsi_ioctl.h>
>  #include <linux/cdrom.h>
> diff -puN drivers/block/cciss_scsi.c~include_scsi_h_unconditionally drivers/block/cciss_scsi.c
> --- linux-2.6.21-rc6/drivers/block/cciss_scsi.c~include_scsi_h_unconditionally	2007-04-13 08:23:53.000000000 -0500
> +++ linux-2.6.21-rc6-scameron/drivers/block/cciss_scsi.c	2007-04-13 08:24:34.000000000 -0500
> @@ -35,7 +35,6 @@
>  
>  #include <asm/atomic.h>
>  
> -#include <scsi/scsi.h> 
>  #include <scsi/scsi_cmnd.h>
>  #include <scsi/scsi_device.h>
>  #include <scsi/scsi_host.h> 

RE: [PATCH 1/1] cciss: include scsi/scsi.h unconditionally

[Cameron, Steve]

Andrew Morton [mailto:akpm@linux-foundation.org] wrote:

> On Fri, 13 Apr 2007 09:23:12 -0500
> Stephen Cameron <steve.cameron@hp.com> wrote:
>
> > Make cciss unconditionally include scsi/scsi.h
> 
> For what reason?

Because the use of:

        case SCSI_IOCTL_GET_IDLUN:
        case SCSI_IOCTL_GET_BUS_NUMBER:


At first, I thought the solution should be make
cciss dependent on CONFIG_SCSI.  Then James Bottomley
convinced me otherwise, and my first instinct was just
to comment out those cases above, since they fall through
to a default case anyway.  Then Christoph Hellwig commented
that with CONFIG_SCSI, we picked up scsi/scsi.h which made
it compile, but only accidentally.  So then I thought to 
include scsi/scsi.h unconditionally.  If it would be preferable
to just comment out those cases and let the default case
handle it, that's fine be me too.

-- steve