The patch that adds nvme_fc_io_getuuid need something like this folded in: diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index a11c69e681180..3c778bb0c2944 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -1911,7 +1911,9 @@ char *nvme_fc_io_getuuid(struct nvmefc_fcp_req *req) struct nvme_fc_fcp_op *op = fcp_req_to_fcp_op(req); struct request *rq = op->rq; - return rq->bio ? blkcg_get_fc_appid(rq->bio) : NULL; + if (!IS_ENABLED(CONFIG_BLK_CGROUP_FC_APPID) || !rq->bio) + return NULL; + return blkcg_get_fc_appid(rq->bio); } EXPORT_SYMBOL_GPL(nvme_fc_io_getuuid);
