| Message ID | 20210703155833.3267-1-martin.petersen@oracle.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: blkcg: Fix application ID config options | expand |
On Sat, Jul 03, 2021 at 11:58:33AM -0400, Martin K. Petersen wrote: > - depends on BLK_CGROUP=y > + depends on BLK_CGROUP=y && NVME_FC BLK_CGROUP is a bool, so I think this can simply be: depends on BLK_CGROUP && NVME_FC Otherwise this looks much better: Reviewed-by: Christoph Hellwig <hch@lst.de>
On Sun, Jul 4, 2021 at 1:46 AM Christoph Hellwig <hch@infradead.org> wrote: > > BLK_CGROUP is a bool, so I think this can simply be: > > depends on BLK_CGROUP && NVME_FC Yeah, applied with that cleanup, and now it no longer annoys me with any spurious questions at all, since I didn't have NVME_FC enabled. Much better. Thanks, Linus
diff --git a/block/Kconfig b/block/Kconfig index 03886d105301..3923ed732ac4 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -146,7 +146,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=y && 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 4dc42a8ff71a..8f44d433e06e 100644 --- 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
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> --- block/Kconfig | 2 +- drivers/scsi/Kconfig | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-)