Commit d2500a0c authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Linus Torvalds
Browse files

scsi: blkcg: Fix application ID config options 



Commit d2bcbeab ("scsi: blkcg: Add app identifier support for
blkcg") introduced an FC_APPID config option under SCSI. However, the
added config option is not used anywhere. Simply remove it.

The block layer BLK_CGROUP_FC_APPID config option is what actually
controls whether the application ID code should be built or not. Make
this option dependent on NVMe over FC since that is currently the only
transport which supports the capability.

Fixes: d2bcbeab ("scsi: blkcg: Add app identifier support for blkcg")
Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 303392fd

block/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ config BLK_CGROUP_IOLATENCY 


config BLK_CGROUP_FC_APPID

	bool "Enable support to track FC I/O Traffic across cgroup applications"

	depends on BLK_CGROUP=y

	depends on BLK_CGROUP && NVME_FC

	help

	  Enabling this option enables the support to track FC I/O traffic across

	  cgroup applications. It enables the Fabric and the storage targets to

drivers/scsi/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -235,19 +235,6 @@ config SCSI_FC_ATTRS 
	  each attached FiberChannel device to sysfs, say Y.

	  Otherwise, say N.



config FC_APPID

	bool "Enable support to track FC I/O Traffic"

	depends on BLOCK && BLK_CGROUP

	depends on SCSI

	select BLK_CGROUP_FC_APPID

	default y

	help

	  If you say Y here, it enables the support to track

	  FC I/O traffic over fabric. It enables the Fabric and the

	  storage targets to identify, monitor, and handle FC traffic

	  based on VM tags by inserting application specific

	  identification into the FC frame.



config SCSI_ISCSI_ATTRS

	tristate "iSCSI Transport Attributes"

	depends on SCSI && NET