Commit 72148aec authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

block: make scsi_request and scsi ioctl support optional

We only need this code to support scsi, ide, cciss and virtio.  And at
least for virtio it's a deprecated feature to start with.

This should shrink the kernel size for embedded device that only use,
say eMMC a bit.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 3719fa86
...@@ -49,9 +49,13 @@ config LBDAF ...@@ -49,9 +49,13 @@ config LBDAF
If unsure, say Y. If unsure, say Y.
config BLK_SCSI_REQUEST
bool
config BLK_DEV_BSG config BLK_DEV_BSG
bool "Block layer SG support v4" bool "Block layer SG support v4"
default y default y
select BLK_SCSI_REQUEST
help help
Saying Y here will enable generic SG (SCSI generic) v4 support Saying Y here will enable generic SG (SCSI generic) v4 support
for any block device. for any block device.
...@@ -71,6 +75,7 @@ config BLK_DEV_BSGLIB ...@@ -71,6 +75,7 @@ config BLK_DEV_BSGLIB
bool "Block layer SG support v4 helper lib" bool "Block layer SG support v4 helper lib"
default n default n
select BLK_DEV_BSG select BLK_DEV_BSG
select BLK_SCSI_REQUEST
help help
Subsystems will normally enable this if needed. Users will not Subsystems will normally enable this if needed. Users will not
normally need to manually enable this. normally need to manually enable this.
......
...@@ -7,10 +7,11 @@ obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.o \ ...@@ -7,10 +7,11 @@ obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.o \
blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \ blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \ blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \
blk-mq-sysfs.o blk-mq-cpumap.o blk-mq-sched.o ioctl.o \ blk-mq-sysfs.o blk-mq-cpumap.o blk-mq-sched.o ioctl.o \
genhd.o scsi_ioctl.o partition-generic.o ioprio.o \ genhd.o partition-generic.o ioprio.o \
badblocks.o partitions/ badblocks.o partitions/
obj-$(CONFIG_BOUNCE) += bounce.o obj-$(CONFIG_BOUNCE) += bounce.o
obj-$(CONFIG_BLK_SCSI_REQUEST) += scsi_ioctl.o
obj-$(CONFIG_BLK_DEV_BSG) += bsg.o obj-$(CONFIG_BLK_DEV_BSG) += bsg.o
obj-$(CONFIG_BLK_DEV_BSGLIB) += bsg-lib.o obj-$(CONFIG_BLK_DEV_BSGLIB) += bsg-lib.o
obj-$(CONFIG_BLK_CGROUP) += blk-cgroup.o obj-$(CONFIG_BLK_CGROUP) += blk-cgroup.o
......
...@@ -69,6 +69,7 @@ config AMIGA_Z2RAM ...@@ -69,6 +69,7 @@ config AMIGA_Z2RAM
config GDROM config GDROM
tristate "SEGA Dreamcast GD-ROM drive" tristate "SEGA Dreamcast GD-ROM drive"
depends on SH_DREAMCAST depends on SH_DREAMCAST
select BLK_SCSI_REQUEST # only for the generic cdrom code
help help
A standard SEGA Dreamcast comes with a modified CD ROM drive called a A standard SEGA Dreamcast comes with a modified CD ROM drive called a
"GD-ROM" by SEGA to signify it is capable of reading special disks "GD-ROM" by SEGA to signify it is capable of reading special disks
...@@ -114,6 +115,7 @@ config BLK_CPQ_CISS_DA ...@@ -114,6 +115,7 @@ config BLK_CPQ_CISS_DA
tristate "Compaq Smart Array 5xxx support" tristate "Compaq Smart Array 5xxx support"
depends on PCI depends on PCI
select CHECK_SIGNATURE select CHECK_SIGNATURE
select BLK_SCSI_REQUEST
help help
This is the driver for Compaq Smart Array 5xxx controllers. This is the driver for Compaq Smart Array 5xxx controllers.
Everyone using these boards should say Y here. Everyone using these boards should say Y here.
...@@ -386,6 +388,7 @@ config BLK_DEV_RAM_DAX ...@@ -386,6 +388,7 @@ config BLK_DEV_RAM_DAX
config CDROM_PKTCDVD 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 BLK_SCSI_REQUEST
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!
...@@ -497,6 +500,7 @@ config XEN_BLKDEV_BACKEND ...@@ -497,6 +500,7 @@ config XEN_BLKDEV_BACKEND
config VIRTIO_BLK config VIRTIO_BLK
tristate "Virtio block driver" tristate "Virtio block driver"
depends on VIRTIO depends on VIRTIO
select BLK_SCSI_REQUEST
---help--- ---help---
This is the virtual block driver for virtio. It can be used with This is the virtual block driver for virtio. It can be used with
lguest or QEMU based VMMs (like KVM or Xen). Say Y or M. lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.
......
...@@ -25,6 +25,7 @@ config PARIDE_PD ...@@ -25,6 +25,7 @@ config PARIDE_PD
config PARIDE_PCD config PARIDE_PCD
tristate "Parallel port ATAPI CD-ROMs" tristate "Parallel port ATAPI CD-ROMs"
depends on PARIDE depends on PARIDE
select BLK_SCSI_REQUEST # only for the generic cdrom code
---help--- ---help---
This option enables the high-level driver for ATAPI CD-ROM devices This option enables the high-level driver for ATAPI CD-ROM devices
connected through a parallel port. If you chose to build PARIDE connected through a parallel port. If you chose to build PARIDE
......
...@@ -10,6 +10,7 @@ menuconfig IDE ...@@ -10,6 +10,7 @@ menuconfig IDE
tristate "ATA/ATAPI/MFM/RLL support (DEPRECATED)" tristate "ATA/ATAPI/MFM/RLL support (DEPRECATED)"
depends on HAVE_IDE depends on HAVE_IDE
depends on BLOCK depends on BLOCK
select BLK_SCSI_REQUEST
---help--- ---help---
If you say Y here, your kernel will be able to manage ATA/(E)IDE and If you say Y here, your kernel will be able to manage ATA/(E)IDE and
ATAPI units. The most common cases are IDE hard drives and ATAPI ATAPI units. The most common cases are IDE hard drives and ATAPI
......
...@@ -18,6 +18,7 @@ config SCSI ...@@ -18,6 +18,7 @@ config SCSI
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
---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
any other SCSI device under Linux, say Y and make sure that you know any other SCSI device under Linux, say Y and make sure that you know
......
...@@ -4,6 +4,7 @@ menuconfig TARGET_CORE ...@@ -4,6 +4,7 @@ menuconfig TARGET_CORE
depends on SCSI && BLOCK depends on SCSI && BLOCK
select CONFIGFS_FS select CONFIGFS_FS
select CRC_T10DIF select CRC_T10DIF
select BLK_SCSI_REQUEST # only for scsi_command_size_tbl..
default n default n
help help
Say Y or M here to enable the TCM Storage Engine and ConfigFS enabled Say Y or M here to enable the TCM Storage Engine and ConfigFS enabled
......
...@@ -104,6 +104,7 @@ config NFSD_SCSILAYOUT ...@@ -104,6 +104,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
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