diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-07-24 09:20:25 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-07-29 04:24:26 +0200 |
| commit | b69367dffd86813495cf01e128ff2c8a8e41bb83 (patch) | |
| tree | 8efd10167c5152ad7aa9baf5a713f125ec4a378d | |
| parent | scsi: scsi_ioctl: Remove scsi_req_init() (diff) | |
| download | linux-b69367dffd86813495cf01e128ff2c8a8e41bb83.tar.xz linux-b69367dffd86813495cf01e128ff2c8a8e41bb83.zip | |
scsi: scsi_ioctl: Move scsi_command_size_tbl to scsi_common.c
Move the SCSI command size table to common SCSI code.
Link: https://lore.kernel.org/r/20210724072033.1284840-17-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | block/scsi_ioctl.c | 8 | ||||
| -rw-r--r-- | drivers/scsi/scsi_common.c | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 4d214f9ac8d0..4d023f2f43f0 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -29,14 +29,6 @@ struct blk_cmd_filter { static struct blk_cmd_filter blk_default_cmd_filter; -/* Command group 3 is reserved and should never be used. */ -const unsigned char scsi_command_size_tbl[8] = -{ - 6, 10, 10, 12, - 16, 12, 10, 10 -}; -EXPORT_SYMBOL(scsi_command_size_tbl); - static int sg_get_version(int __user *p) { static const int sg_version_num = 30527; diff --git a/drivers/scsi/scsi_common.c b/drivers/scsi/scsi_common.c index 90349498f686..8aac4e5e8c4c 100644 --- a/drivers/scsi/scsi_common.c +++ b/drivers/scsi/scsi_common.c @@ -10,6 +10,12 @@ #include <asm/unaligned.h> #include <scsi/scsi_common.h> +/* Command group 3 is reserved and should never be used. */ +const unsigned char scsi_command_size_tbl[8] = { + 6, 10, 10, 12, 16, 12, 10, 10 +}; +EXPORT_SYMBOL(scsi_command_size_tbl); + /* NB: These are exposed through /proc/scsi/scsi and form part of the ABI. * You may not alter any existing entry (although adding new ones is * encouraged once assigned by ANSI/INCITS T10). |