From: hch@infradead.org (Christoph Hellwig)
Subject: [PATCH] nvme: use an integer value to Linux errno values
Date: Thu, 15 Oct 2015 07:57:52 -0700 [thread overview]
Message-ID: <20151015145752.GA8622@infradead.org> (raw)
In-Reply-To: <1444677819-23822-1-git-send-email-hch@lst.de>
Can I get a review for this one? This is something that should probably
got to Linus for 4.3.
On Mon, Oct 12, 2015@09:23:39PM +0200, Christoph Hellwig wrote:
> Use a separate integer variable to hold the signed Linux errno
> values we pass back to the block layer. Note that for pass through
> commands those might still be NVMe values, but those fit into the
> int as well.
>
> Fixes: f4829a9b7a61: ("blk-mq: fix racy updates of rq->errors")
> Reported-by: Dan Carpenter <dan.carpenter at oracle.com>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
> drivers/nvme/host/pci.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index a526696..9049888 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -606,8 +606,8 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx,
> struct nvme_iod *iod = ctx;
> struct request *req = iod_get_private(iod);
> struct nvme_cmd_info *cmd_rq = blk_mq_rq_to_pdu(req);
> -
> u16 status = le16_to_cpup(&cqe->status) >> 1;
> + int error;
>
> if (unlikely(status)) {
> if (!(status & NVME_SC_DNR || blk_noretry_request(req))
> @@ -624,9 +624,11 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx,
>
> if (req->cmd_type == REQ_TYPE_DRV_PRIV) {
> if (cmd_rq->ctx == CMD_CTX_CANCELLED)
> - status = -EINTR;
> + error = -EINTR;
> + else
> + error = status;
> } else {
> - status = nvme_error_status(status);
> + error = nvme_error_status(status);
> }
> }
>
> @@ -638,7 +640,7 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx,
> if (cmd_rq->aborted)
> dev_warn(nvmeq->dev->dev,
> "completing aborted command with status:%04x\n",
> - status);
> + error);
>
> if (iod->nents) {
> dma_unmap_sg(nvmeq->dev->dev, iod->sg, iod->nents,
> @@ -652,7 +654,7 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx,
> }
> nvme_free_iod(nvmeq->dev, iod);
>
> - blk_mq_complete_request(req, status);
> + blk_mq_complete_request(req, error);
> }
>
> /* length is in bytes. gfp flags indicates whether we may sleep. */
> --
> 1.9.1
>
>
> _______________________________________________
> Linux-nvme mailing list
> Linux-nvme at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-nvme
---end quoted text---
next prev parent reply other threads:[~2015-10-15 14:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 19:23 [PATCH] nvme: use an integer value to Linux errno values Christoph Hellwig
2015-10-15 14:57 ` Christoph Hellwig [this message]
2015-10-15 15:13 ` Keith Busch
2015-10-15 15:30 ` Christoph Hellwig
2015-10-15 15:51 ` Jens Axboe
2015-10-15 15:04 ` Jens Axboe
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=20151015145752.GA8622@infradead.org \
--to=hch@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).