summary refs log tree commit diff
path: root/block
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2021-07-03 11:58:33 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2021-07-04 11:44:22 -0700
commitd2500a0c0e73d4387cde9185edcdf397f52e428b (patch)
tree5a1755336af32929fa7f29630323052ea18e3cb2 /block
parent303392fd5c160822bf778270b28ec5ea50cab2b4 (diff)
downloadlinux-d2500a0c0e73d4387cde9185edcdf397f52e428b.tar.gz
scsi: blkcg: Fix application ID config options
Commit d2bcbeab4200 ("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: d2bcbeab4200 ("scsi: blkcg: Add app identifier support for blkcg")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'block')
-rw-r--r--block/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/Kconfig b/block/Kconfig
index 7885a27bd949..fd732aede922 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -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