Re: [PATCH] 2.5.68: Don't include SCSI block ioctls on non-scsi systems

From: Christopher Hoover (ch@murgatroid.com)
Date: Wed May 14 2003 - 03:08:02 EST


On Wed, May 14, 2003 at 06:57:52AM +0100, Christoph Hellwig wrote:
> On Tue, May 13, 2003 at 08:29:20PM -0700, Christopher Hoover wrote:
> > Unless I'm missing something, there doesn't seem to be a good reason
> > for the block system to include SCSI ioctls unless there's a SCSI
> > block device (CONFIG_BLK_DEV_SD) in the system.
>
> That's broken. You can use them on ide, sd and sr currently.

OK, let's try that again.

diff -X /home/ch/src/dontdiff.txt -Naurp linux-2.5.69.orig/drivers/block/Kconfig linux-2.5.69/drivers/block/Kconfig
--- linux-2.5.69.orig/drivers/block/Kconfig 2003-05-04 16:53:08.000000000 -0700
+++ linux-2.5.69/drivers/block/Kconfig 2003-05-14 00:58:36.000000000 -0700
@@ -348,3 +348,6 @@ config LBD
 
 endmenu
 
+config SCSI_IOCTL
+ bool
+ default y if IDE||SCSI
diff -X /home/ch/src/dontdiff.txt -Naurp linux-2.5.69.orig/drivers/block/Makefile linux-2.5.69/drivers/block/Makefile
--- linux-2.5.69.orig/drivers/block/Makefile 2003-05-04 16:53:37.000000000 -0700
+++ linux-2.5.69/drivers/block/Makefile 2003-05-14 00:58:50.000000000 -0700
@@ -8,7 +8,9 @@
 # In the future, some of these should be built conditionally.
 #
 
-obj-y := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o deadline-iosched.o
+obj-y := elevator.o ll_rw_blk.o ioctl.o genhd.o deadline-iosched.o
+
+obj-$(CONFIG_SCSI_IOCTL) += scsi_ioctl.o
 
 obj-$(CONFIG_MAC_FLOPPY) += swim3.o
 obj-$(CONFIG_BLK_DEV_FD) += floppy.o
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu May 15 2003 - 22:00:50 EST