Fix: BK-Current doesn't compile w/o SCSI enabled
Subsystems (2)
PATCH 1/1 Fix: BK-Current doesn't compile w/o SCSI enabled
BK current doesn't compile without SCSI being enabled, since sg_scsi_ioctl() in drivers/block/scsi_ioctl.c is always being compiled, regardless of whether or not SCSI is present (since some non-SCSI devices now use this infrastructure). Unfortunately, it makes reference to the COMMAND_SIZE() macro, which is defined in drivers/scsi/scsi.c, and that is NOT defined on non-SCSI build kernels.
The simplest solution to this problem seems to be move scsi_command_size from drivers/scsi/scsi.c to drivers/block/scsi_ioctl.c, where it is used (and since it is always compiled in, this shouldn't break anything on SCSI systems).
I'm a bit uneasy about the abstraction violation of moving the scsi_command_size array outside of the drivers/scsi tree, but that problem was introduced when the code in drivers/block/scsi_ioctl.c was moved out of the drivers/scsi tree, since drivers/block/scsi_ioctl.c already #includes ../scsi/scsi.h, so I haven't introduced a new layering violation.
Jens, do you agree this is the best way of fixing this issue? If so, please push this change to Linus. Thanks!!
- Ted
drivers/block/scsi_ioctl.c +8 -0
@@ -39,6 +39,14 @@#define BLK_DEFAULT_TIMEOUT (60 * HZ) +/* Command group 3 is reserved and should never be used. */ +const unsigned char scsi_command_size[8 ] = +{ +6 ,10 ,10 ,12 , +16 ,12 ,10 ,10 +}; +EXPORT_SYMBOL (scsi_command_size); +int blk_do_rq (request_queue_t *q,struct block_device *bdev,struct request *rq) {DECLARE_COMPLETION (wait);
drivers/scsi/scsi.c +0 -6
@@ -123,12 +123,6 @@*/ unsigned long scsi_pid;Scsi_Cmnd *last_cmnd; -/* Command group 3 is reserved and should never be used. */ -const unsigned char scsi_command_size[8 ] = -{ -6 ,10 ,10 ,12 , -16 ,12 ,10 ,10 -};static unsigned long serial_number;struct softscsi_data {
drivers/scsi/scsi_syms.c +0 -1
@@ -39,7 +39,6 @@EXPORT_SYMBOL (scsi_bios_ptable);EXPORT_SYMBOL (scsi_allocate_device);EXPORT_SYMBOL (scsi_do_cmd); -EXPORT_SYMBOL (scsi_command_size);EXPORT_SYMBOL (scsi_ioctl);EXPORT_SYMBOL (print_command);EXPORT_SYMBOL (print_sense);
Quoted 13 lines · On Tue, Oct 29 2002, [email protected] wrote:
BK current doesn't compile without SCSI being enabled, since
sg_scsi_ioctl()indrivers/block/scsi_ioctl.cis always being compiled, regardless of whether or not SCSI is present (since some non-SCSI devices now use this infrastructure). Unfortunately, it makes reference to theCOMMAND_SIZE()macro, which is defined indrivers/scsi/scsi.c, and that is NOT defined on non-SCSI build kernels.The simplest solution to this problem seems to be move
scsi_command_sizefromdrivers/scsi/scsi.ctodrivers/block/scsi_ioctl.c, where it is used (and since it is always compiled in, this shouldn't break anything on SCSI systems).
Quoted 6 lines
I'm a bit uneasy about the abstraction violation of moving the
scsi_command_sizearray outside of thedrivers/scsitree, but that problem was introduced when the code indrivers/block/scsi_ioctl.cwas moved out of thedrivers/scsitree, sincedrivers/block/scsi_ioctl.calready #includes../scsi/scsi.h, so I haven't introduced a new layering violation.
I think the "violation" is ok, since the commandset they reference is the same. So no problem there.
Quoted 2 lines
Jens, do you agree this is the best way of fixing this issue? If so, please push this change to Linus. Thanks!!
I've already sent the very same patch to Linus earlier today, bit-for-bit identical :-)
Signature · 1 line
Jens Axboe