Commit ad7a458c authored by Jens Axboe's avatar Jens Axboe

[PATCH] scsi_command_size[] only known when SCSI is enabled

block/scsi_ioctl.c uses scsi_command_size[] to get from opcode to length
of cdb, but that is only available with SCSI enabled. Move to
block/scsi_ioctl.c from scsi/scsi.c.
parent ad3fb438
...@@ -37,6 +37,13 @@ ...@@ -37,6 +37,13 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
/* 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
};
#define BLK_DEFAULT_TIMEOUT (60 * HZ) #define BLK_DEFAULT_TIMEOUT (60 * HZ)
int blk_do_rq(request_queue_t *q, struct block_device *bdev, struct request *rq) int blk_do_rq(request_queue_t *q, struct block_device *bdev, struct request *rq)
......
...@@ -123,12 +123,6 @@ struct scsi_host_sg_pool scsi_sg_pools[SG_MEMPOOL_NR] = { ...@@ -123,12 +123,6 @@ struct scsi_host_sg_pool scsi_sg_pools[SG_MEMPOOL_NR] = {
*/ */
unsigned long scsi_pid; unsigned long scsi_pid;
Scsi_Cmnd *last_cmnd; 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; static unsigned long serial_number;
struct softscsi_data { struct softscsi_data {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment