scsi: scsi_ioctl: Move scsi_command_size_tbl to scsi_common.c

Move the SCSI command size table to common SCSI code.

Christoph Hellwig committed 5 years ago

Commit b69367d1 parent 2cece372 files · +6 −8Browse files

Unified · Split

2 files

block/scsi_ioctl.c +0 −8
drivers/scsi/scsi_common.c +6 −0

block/scsi_ioctl.c+0−8

@@ -29,14 +29,6 @@ struct blk_cmd_filter { · 28 unmodified lines
29	29
30	30	static struct blk_cmd_filter blk_default_cmd_filter;
31	31
32		−/* Command group 3 is reserved and should never be used. */
33		−const unsigned char scsi_command_size_tbl[8] =
34		−{
35		− 6, 10, 10, 12,
36		− 16, 12, 10, 10
37		−};
38		−EXPORT_SYMBOL(scsi_command_size_tbl);
39		−
40	32	static int sg_get_version(int __user *p)
41	33	{
42	34	static const int sg_version_num = 30527;

drivers/scsi/scsi_common.c+6−0

@@ -10,6 +10,12 @@ · 9 unmodified lines
10	10	#include <asm/unaligned.h>
11	11	#include <scsi/scsi_common.h>
12	12
	13	+/* Command group 3 is reserved and should never be used. */
	14	+const unsigned char scsi_command_size_tbl[8] = {
	15	+ 6, 10, 10, 12, 16, 12, 10, 10
	16	+};
	17	+EXPORT_SYMBOL(scsi_command_size_tbl);
	18	+
13	19	/* NB: These are exposed through /proc/scsi/scsi and form part of the ABI.
14	20	* You may not alter any existing entry (although adding new ones is
15	21	* encouraged once assigned by ANSI/INCITS T10).