Commit 33ff4ce4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen

scsi: core: Rename CONFIG_BLK_SCSI_REQUEST to CONFIG_SCSI_COMMON

CONFIG_BLK_SCSI_REQUEST is rather misnamed as it enables building a small
amount of code shared by the SCSI initiator, target, and consumers of the
scsi_request passthrough API.  Rename it and also allow building it as a
module.

[mkp: add module license]

Link: https://lore.kernel.org/r/20210724072033.1284840-20-hch@lst.deSigned-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f2542a3b
...@@ -29,9 +29,6 @@ if BLOCK ...@@ -29,9 +29,6 @@ if BLOCK
config BLK_RQ_ALLOC_TIME config BLK_RQ_ALLOC_TIME
bool bool
config BLK_SCSI_REQUEST
bool
config BLK_CGROUP_RWSTAT config BLK_CGROUP_RWSTAT
bool bool
......
...@@ -305,7 +305,7 @@ config CDROM_PKTCDVD ...@@ -305,7 +305,7 @@ config CDROM_PKTCDVD
tristate "Packet writing on CD/DVD media (DEPRECATED)" tristate "Packet writing on CD/DVD media (DEPRECATED)"
depends on !UML depends on !UML
select CDROM select CDROM
select BLK_SCSI_REQUEST select SCSI_COMMON
help help
Note: This driver is deprecated and will be removed from the Note: This driver is deprecated and will be removed from the
kernel in the near future! kernel in the near future!
......
...@@ -14,12 +14,15 @@ config RAID_ATTRS ...@@ -14,12 +14,15 @@ config RAID_ATTRS
help help
Provides RAID Provides RAID
config SCSI_COMMON
tristate
config SCSI config SCSI
tristate "SCSI device support" tristate "SCSI device support"
depends on BLOCK depends on BLOCK
select SCSI_DMA if HAS_DMA select SCSI_DMA if HAS_DMA
select SG_POOL select SG_POOL
select BLK_SCSI_REQUEST select SCSI_COMMON
select BLK_DEV_BSG_COMMON if BLK_DEV_BSG select BLK_DEV_BSG_COMMON if BLK_DEV_BSG
help help
If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or
......
...@@ -20,7 +20,7 @@ CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF ...@@ -20,7 +20,7 @@ CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF
obj-$(CONFIG_PCMCIA) += pcmcia/ obj-$(CONFIG_PCMCIA) += pcmcia/
obj-$(CONFIG_SCSI) += scsi_mod.o obj-$(CONFIG_SCSI) += scsi_mod.o
obj-$(CONFIG_BLK_SCSI_REQUEST) += scsi_common.o obj-$(CONFIG_SCSI_COMMON) += scsi_common.o
obj-$(CONFIG_RAID_ATTRS) += raid_class.o obj-$(CONFIG_RAID_ATTRS) += raid_class.o
......
...@@ -7,9 +7,12 @@ ...@@ -7,9 +7,12 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/module.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <scsi/scsi_common.h> #include <scsi/scsi_common.h>
MODULE_LICENSE("GPL v2");
/* Command group 3 is reserved and should never be used. */ /* Command group 3 is reserved and should never be used. */
const unsigned char scsi_command_size_tbl[8] = { const unsigned char scsi_command_size_tbl[8] = {
6, 10, 10, 12, 16, 12, 10, 10 6, 10, 10, 12, 16, 12, 10, 10
......
...@@ -5,7 +5,7 @@ menuconfig TARGET_CORE ...@@ -5,7 +5,7 @@ menuconfig TARGET_CORE
depends on BLOCK depends on BLOCK
select CONFIGFS_FS select CONFIGFS_FS
select CRC_T10DIF select CRC_T10DIF
select BLK_SCSI_REQUEST select SCSI_COMMON
select SGL_ALLOC select SGL_ALLOC
default n default n
help help
......
...@@ -109,7 +109,7 @@ config NFSD_SCSILAYOUT ...@@ -109,7 +109,7 @@ config NFSD_SCSILAYOUT
depends on NFSD_V4 && BLOCK depends on NFSD_V4 && BLOCK
select NFSD_PNFS select NFSD_PNFS
select EXPORTFS_BLOCK_OPS select EXPORTFS_BLOCK_OPS
select BLK_SCSI_REQUEST select SCSI_COMMON
help help
This option enables support for the exporting pNFS SCSI layouts This option enables support for the exporting pNFS SCSI layouts
in the kernel's NFS server. The pNFS SCSI layout enables NFS in the kernel's NFS server. The pNFS SCSI layout enables NFS
......
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