[PATCH 1/1] cciss: kconfig patch to make cciss dependent on scsi for SG_IO ioctl

[PATCH 1/1] cciss: kconfig patch to make cciss dependent on scsi for SG_IO ioctl

[Mike Miller (OS Dev)]

PATCH 1/1

This kconfig patch makes cciss dependent on scsi for the new SG_IO ioctl we just
added. If cciss is built into the kernel it makes sures that scsi is also statically
linked. If scsi is a module then cciss will also be built as a module. Please consider
this for inclusion.

Signed-off-by: Stephen M. Cameron <steve.cameron@hp.com>
Signed-off-by: Mike Miller <mike.miller@hp.com>
------------------------------------------------------------------------------------------

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

diff -puN drivers/block/cciss.c~cciss_sg_io_kconfig drivers/block/cciss.c
diff -puN drivers/block/Kconfig~cciss_sg_io_kconfig drivers/block/Kconfig
--- linux-2.6.21-rc6/drivers/block/Kconfig~cciss_sg_io_kconfig	2007-04-12 08:16:45.000000000 -0500
+++ linux-2.6.21-rc6-scameron/drivers/block/Kconfig	2007-04-12 08:20:41.000000000 -0500
@@ -152,6 +152,7 @@ config BLK_CPQ_DA
 config BLK_CPQ_CISS_DA
 	tristate "Compaq Smart Array 5xxx support"
 	depends on PCI
+	depends on SCSI
 	help
 	  This is the driver for Compaq Smart Array 5xxx controllers.
 	  Everyone using these boards should say Y here.
@@ -162,7 +163,6 @@ config BLK_CPQ_CISS_DA
 config CISS_SCSI_TAPE
 	bool "SCSI tape drive support for Smart Array 5xxx"
 	depends on BLK_CPQ_CISS_DA && PROC_FS
-	depends on SCSI=y || SCSI=BLK_CPQ_CISS_DA
 	help
 	  When enabled (Y), this option allows SCSI tape drives and SCSI medium
 	  changers (tape robots) to be accessed via a Compaq 5xxx array 
_

Re: [PATCH 1/1] cciss: kconfig patch to make cciss dependent on scsi for SG_IO ioctl

[James Bottomley]

On Thu, 2007-04-12 at 16:27 -0500, Mike Miller (OS Dev) wrote:
> This kconfig patch makes cciss dependent on scsi for the new SG_IO ioctl we just
> added. If cciss is built into the kernel it makes sures that scsi is also statically
> linked. If scsi is a module then cciss will also be built as a module. Please consider
> this for inclusion.

Erm, I don't think this is necessary: SG_IO is a property of the block
layer, not SCSI (as in it will work without SCSI even present).  SCSI
has a special driver: the sg driver that has its own implementation of
SG_IO, but that's the only connection.

James

RE: [PATCH 1/1] cciss: kconfig patch to make cciss dependent onscsi for SG_IO ioctl

[Cameron, Steve]

Well, with SCSI turned off, it didn't compile:


drivers/block/cciss.c: In function `cciss_ioctl':
drivers/block/cciss.c:1180: error: `SCSI_IOCTL_GET_IDLUN' undeclared (first use in this function)
drivers/block/cciss.c:1180: error: (Each undeclared identifier is reported only once
drivers/block/cciss.c:1180: error: for each function it appears in.)
drivers/block/cciss.c:1181: error: `SCSI_IOCTL_GET_BUS_NUMBER' undeclared (first use in this function)
make[2]: *** [drivers/block/cciss.o] Error 1
make[1]: *** [drivers/block] Error 2
make: *** [drivers] Error 2

-- steve


-----Original Message-----
From: James Bottomley [mailto:James.Bottomley@SteelEye.com]
Sent: Thu 4/12/2007 5:07 PM
To: Mike Miller (OS Dev)
Cc: akpm@linux-foundation.org; jens.axboe@oracle.com; linux-kernel@vger.kernel.org; linux-scsi@vger.kernel.org; Cameron, Steve
Subject: Re: [PATCH 1/1] cciss: kconfig patch to make cciss dependent onscsi for SG_IO ioctl
 
On Thu, 2007-04-12 at 16:27 -0500, Mike Miller (OS Dev) wrote:
> This kconfig patch makes cciss dependent on scsi for the new SG_IO ioctl we just
> added. If cciss is built into the kernel it makes sures that scsi is also statically
> linked. If scsi is a module then cciss will also be built as a module. Please consider
> this for inclusion.

Erm, I don't think this is necessary: SG_IO is a property of the block
layer, not SCSI (as in it will work without SCSI even present).  SCSI
has a special driver: the sg driver that has its own implementation of
SG_IO, but that's the only connection.

James

Re: [PATCH 1/1] cciss: kconfig patch to make cciss dependent onscsi for SG_IO ioctl

[Christoph Hellwig]

On Fri, Apr 13, 2007 at 01:58:41PM +0100, Cameron, Steve wrote:
> 
> Well, with SCSI turned off, it didn't compile:
> 
> 
> drivers/block/cciss.c: In function `cciss_ioctl':
> drivers/block/cciss.c:1180: error: `SCSI_IOCTL_GET_IDLUN' undeclared (first use in this function)
> drivers/block/cciss.c:1180: error: (Each undeclared identifier is reported only once
> drivers/block/cciss.c:1180: error: for each function it appears in.)
> drivers/block/cciss.c:1181: error: `SCSI_IOCTL_GET_BUS_NUMBER' undeclared (first use in this function)

The two are defined in scsi/scsi.h unconditionally.  Make sure to add
an unconditional include of that header to your driver, apparently you're
only picking it up by accident when CONFIG_SCSI is enabled.

RE: [PATCH 1/1] cciss: kconfig patch to make cciss dependent onscsi for SG_IO ioctl

[Cameron, Steve]

Hmm, now that I look again, those ioctls it's complaining
about are ones for which we just return ENOTTY, so I guess 
we don't really need them listed explicitly, and if they
weren't, the Kconfig patch would be unnecessary.

-- steve

-----Original Message-----
From: Cameron, Steve
Sent: Fri 4/13/2007 7:58 AM
To: James Bottomley; Mike Miller (OS Dev)
Cc: akpm@linux-foundation.org; jens.axboe@oracle.com; linux-kernel@vger.kernel.org; linux-scsi@vger.kernel.org
Subject: RE: [PATCH 1/1] cciss: kconfig patch to make cciss dependent onscsi for SG_IO ioctl
 

Well, with SCSI turned off, it didn't compile:


drivers/block/cciss.c: In function `cciss_ioctl':
drivers/block/cciss.c:1180: error: `SCSI_IOCTL_GET_IDLUN' undeclared (first use in this function)
drivers/block/cciss.c:1180: error: (Each undeclared identifier is reported only once
drivers/block/cciss.c:1180: error: for each function it appears in.)
drivers/block/cciss.c:1181: error: `SCSI_IOCTL_GET_BUS_NUMBER' undeclared (first use in this function)
make[2]: *** [drivers/block/cciss.o] Error 1
make[1]: *** [drivers/block] Error 2
make: *** [drivers] Error 2

-- steve


-----Original Message-----
From: James Bottomley [mailto:James.Bottomley@SteelEye.com]
Sent: Thu 4/12/2007 5:07 PM
To: Mike Miller (OS Dev)
Cc: akpm@linux-foundation.org; jens.axboe@oracle.com; linux-kernel@vger.kernel.org; linux-scsi@vger.kernel.org; Cameron, Steve
Subject: Re: [PATCH 1/1] cciss: kconfig patch to make cciss dependent onscsi for SG_IO ioctl
 
On Thu, 2007-04-12 at 16:27 -0500, Mike Miller (OS Dev) wrote:
> This kconfig patch makes cciss dependent on scsi for the new SG_IO ioctl we just
> added. If cciss is built into the kernel it makes sures that scsi is also statically
> linked. If scsi is a module then cciss will also be built as a module. Please consider
> this for inclusion.

Erm, I don't think this is necessary: SG_IO is a property of the block
layer, not SCSI (as in it will work without SCSI even present).  SCSI
has a special driver: the sg driver that has its own implementation of
SG_IO, but that's the only connection.

James