[PATCH 2/2] nvme: use return value from blk_execute_rq()
Keith Busch
kbusch at kernel.org
Fri Apr 16 17:53:53 BST 2021
We don't have an nvme status to report if the driver's .queue_rq()
returns an error without dispatching the requested nvme command. Use the
return value from blk_execute_rq() so the caller may know their command
was not successful.
Reported-by: Yuanyuan Zhong <yzhong at purestorage.com>
Signed-off-by: Keith Busch <kbusch at kernel.org>
---
drivers/nvme/host/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 85538c38aae9..b57157106cac 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1000,12 +1000,12 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
if (poll)
nvme_execute_rq_polled(req->q, NULL, req, at_head);
else
- blk_execute_rq(NULL, req, at_head);
+ ret = blk_execute_rq(NULL, req, at_head);
if (result)
*result = nvme_req(req)->result;
if (nvme_req(req)->flags & NVME_REQ_CANCELLED)
ret = -EINTR;
- else
+ else if (nvme_req(req)->status)
ret = nvme_req(req)->status;
out:
blk_mq_free_request(req);
--
2.25.4
More information about the Linux-nvme
mailing list