Skip to content

Commit 33ff4ce

Browse files
Christoph Hellwigmartinkpetersen
authored andcommitted
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.de Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent f2542a3 commit 33ff4ce

7 files changed

Lines changed: 11 additions & 8 deletions

File tree

block/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ if BLOCK
2929
config BLK_RQ_ALLOC_TIME
3030
bool
3131

32-
config BLK_SCSI_REQUEST
33-
bool
34-
3532
config BLK_CGROUP_RWSTAT
3633
bool
3734

drivers/block/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ config CDROM_PKTCDVD
305305
tristate "Packet writing on CD/DVD media (DEPRECATED)"
306306
depends on !UML
307307
select CDROM
308-
select BLK_SCSI_REQUEST
308+
select SCSI_COMMON
309309
help
310310
Note: This driver is deprecated and will be removed from the
311311
kernel in the near future!

drivers/scsi/Kconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ config RAID_ATTRS
1414
help
1515
Provides RAID
1616

17+
config SCSI_COMMON
18+
tristate
19+
1720
config SCSI
1821
tristate "SCSI device support"
1922
depends on BLOCK
2023
select SCSI_DMA if HAS_DMA
2124
select SG_POOL
22-
select BLK_SCSI_REQUEST
25+
select SCSI_COMMON
2326
select BLK_DEV_BSG_COMMON if BLK_DEV_BSG
2427
help
2528
If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or

drivers/scsi/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF
2020
obj-$(CONFIG_PCMCIA) += pcmcia/
2121

2222
obj-$(CONFIG_SCSI) += scsi_mod.o
23-
obj-$(CONFIG_BLK_SCSI_REQUEST) += scsi_common.o
23+
obj-$(CONFIG_SCSI_COMMON) += scsi_common.o
2424

2525
obj-$(CONFIG_RAID_ATTRS) += raid_class.o
2626

drivers/scsi/scsi_common.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
#include <linux/kernel.h>
88
#include <linux/string.h>
99
#include <linux/errno.h>
10+
#include <linux/module.h>
1011
#include <asm/unaligned.h>
1112
#include <scsi/scsi_common.h>
1213

14+
MODULE_LICENSE("GPL v2");
15+
1316
/* Command group 3 is reserved and should never be used. */
1417
const unsigned char scsi_command_size_tbl[8] = {
1518
6, 10, 10, 12, 16, 12, 10, 10

drivers/target/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ menuconfig TARGET_CORE
55
depends on BLOCK
66
select CONFIGFS_FS
77
select CRC_T10DIF
8-
select BLK_SCSI_REQUEST
8+
select SCSI_COMMON
99
select SGL_ALLOC
1010
default n
1111
help

fs/nfsd/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ config NFSD_SCSILAYOUT
109109
depends on NFSD_V4 && BLOCK
110110
select NFSD_PNFS
111111
select EXPORTFS_BLOCK_OPS
112-
select BLK_SCSI_REQUEST
112+
select SCSI_COMMON
113113
help
114114
This option enables support for the exporting pNFS SCSI layouts
115115
in the kernel's NFS server. The pNFS SCSI layout enables NFS

0 commit comments

Comments
 (0)