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>

diff --git a/block/Kconfig b/block/Kconfig
index 7885a27bd9499eb7b5ddd53e452e8aa1c22b5ab1..fd732aede922360a7fbd92fece364bc3aab3e9ba 100644 (file)
--- 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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 4dc42a8ff71a00d3daacb988b71ae5f4bbe2050d..8f44d433e06e0e12f63cc4597f36143df386fd33 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -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