tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Christoph Hellwig and committed by
Martin K. Petersen 33ff4ce4 f2542a3b

+11 -8
-3
block/Kconfig
··· 29 29 config BLK_RQ_ALLOC_TIME 30 30 bool 31 31 32 - config BLK_SCSI_REQUEST 33 - bool 34 - 35 32 config BLK_CGROUP_RWSTAT 36 33 bool 37 34
+1 -1
drivers/block/Kconfig
··· 305 305 tristate "Packet writing on CD/DVD media (DEPRECATED)" 306 306 depends on !UML 307 307 select CDROM 308 - select BLK_SCSI_REQUEST 308 + select SCSI_COMMON 309 309 help 310 310 Note: This driver is deprecated and will be removed from the 311 311 kernel in the near future!
+4 -1
drivers/scsi/Kconfig
··· 14 14 help 15 15 Provides RAID 16 16 17 + config SCSI_COMMON 18 + tristate 19 + 17 20 config SCSI 18 21 tristate "SCSI device support" 19 22 depends on BLOCK 20 23 select SCSI_DMA if HAS_DMA 21 24 select SG_POOL 22 - select BLK_SCSI_REQUEST 25 + select SCSI_COMMON 23 26 select BLK_DEV_BSG_COMMON if BLK_DEV_BSG 24 27 help 25 28 If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or
+1 -1
drivers/scsi/Makefile
··· 20 20 obj-$(CONFIG_PCMCIA) += pcmcia/ 21 21 22 22 obj-$(CONFIG_SCSI) += scsi_mod.o 23 - obj-$(CONFIG_BLK_SCSI_REQUEST) += scsi_common.o 23 + obj-$(CONFIG_SCSI_COMMON) += scsi_common.o 24 24 25 25 obj-$(CONFIG_RAID_ATTRS) += raid_class.o 26 26
+3
drivers/scsi/scsi_common.c
··· 7 7 #include <linux/kernel.h> 8 8 #include <linux/string.h> 9 9 #include <linux/errno.h> 10 + #include <linux/module.h> 10 11 #include <asm/unaligned.h> 11 12 #include <scsi/scsi_common.h> 13 + 14 + MODULE_LICENSE("GPL v2"); 12 15 13 16 /* Command group 3 is reserved and should never be used. */ 14 17 const unsigned char scsi_command_size_tbl[8] = {
+1 -1
drivers/target/Kconfig
··· 5 5 depends on BLOCK 6 6 select CONFIGFS_FS 7 7 select CRC_T10DIF 8 - select BLK_SCSI_REQUEST 8 + select SCSI_COMMON 9 9 select SGL_ALLOC 10 10 default n 11 11 help
+1 -1
fs/nfsd/Kconfig
··· 109 109 depends on NFSD_V4 && BLOCK 110 110 select NFSD_PNFS 111 111 select EXPORTFS_BLOCK_OPS 112 - select BLK_SCSI_REQUEST 112 + select SCSI_COMMON 113 113 help 114 114 This option enables support for the exporting pNFS SCSI layouts 115 115 in the kernel's NFS server. The pNFS SCSI layout enables NFS