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.
Unified · Split
| @@ -153,7 +153,7 @@ config BLK_CGROUP_IOLATENCY · 152 unmodified lines | |||
| 153 | 153 | ||
| 154 | config BLK_CGROUP_FC_APPID | 154 | config BLK_CGROUP_FC_APPID |
| 155 | bool "Enable support to track FC I/O Traffic across cgroup applications" | 155 | bool "Enable support to track FC I/O Traffic across cgroup applications" |
| 156 | depends on BLK_CGROUP=y | 156 | depends on BLK_CGROUP && NVME_FC |
| 157 | help | 157 | help |
| 158 | Enabling this option enables the support to track FC I/O traffic across | 158 | Enabling this option enables the support to track FC I/O traffic across |
| 159 | cgroup applications. It enables the Fabric and the storage targets to | 159 | cgroup applications. It enables the Fabric and the storage targets to |
| @@ -235,19 +235,6 @@ config SCSI_FC_ATTRS · 234 unmodified lines | |||
| 235 | each attached FiberChannel device to sysfs, say Y. | 235 | each attached FiberChannel device to sysfs, say Y. |
| 236 | Otherwise, say N. | 236 | Otherwise, say N. |
| 237 | 237 | ||
| 238 | config FC_APPID | ||
| 239 | bool "Enable support to track FC I/O Traffic" | ||
| 240 | depends on BLOCK && BLK_CGROUP | ||
| 241 | depends on SCSI | ||
| 242 | select BLK_CGROUP_FC_APPID | ||
| 243 | default y | ||
| 244 | help | ||
| 245 | If you say Y here, it enables the support to track | ||
| 246 | FC I/O traffic over fabric. It enables the Fabric and the | ||
| 247 | storage targets to identify, monitor, and handle FC traffic | ||
| 248 | based on VM tags by inserting application specific | ||
| 249 | identification into the FC frame. | ||
| 250 | |||
| 251 | config SCSI_ISCSI_ATTRS | 238 | config SCSI_ISCSI_ATTRS |
| 252 | tristate "iSCSI Transport Attributes" | 239 | tristate "iSCSI Transport Attributes" |
| 253 | depends on SCSI && NET | 240 | depends on SCSI && NET |