From: Christoph Hellwig <hch@lst•de>
To: Randy Dunlap <rdunlap@infradead•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
James Smart <james.smart@broadcom•com>,
linux-nvme@lists•infradead.org, Christoph Hellwig <hch@lst•de>
Subject: Re: linux-next: Tree for May 17 (drivers/nvme/host/fc.o)
Date: Wed, 18 May 2022 06:57:04 +0200 [thread overview]
Message-ID: <20220518045704.GA30131@lst.de> (raw)
In-Reply-To: <5958ccea-d89c-8b1a-15d3-19d8cacd141d@infradead.org>
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);
next prev parent reply other threads:[~2022-05-18 4:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-17 9:41 linux-next: Tree for May 17 Stephen Rothwell
2022-05-17 22:14 ` linux-next: Tree for May 17 (drivers/nvme/host/fc.o) Randy Dunlap
2022-05-18 4:57 ` Christoph Hellwig [this message]
2022-05-18 5:21 ` Randy Dunlap
2022-10-19 13:21 ` James Smart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220518045704.GA30131@lst.de \
--to=hch@lst$(echo .)de \
--cc=james.smart@broadcom$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-nvme@lists$(echo .)infradead.org \
--cc=rdunlap@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox