nvme: re-fix error-handling for io_uring nvme-passthrough

This was previously fixed with commit 1147dd0503564fa0e0348
("nvme: fix error-handling for io_uring nvme-passthrough"), but the
change was mistakenly undone in a later commit.

Fixes: d6aacee9255e7f ("nvme: use bio_integrity_map_user")
Cc: stable@vger.kernel.org
Reported-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Anuj Gupta <anuj20.g@samsung.com>
Reviewed-by: Kanchan Joshi <joshi.k@samsung.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
index b9b79ccfabf8ab17f7fe4370779d4e2f79822802..a96976b22fa7968c110a73199ac3cbabcb8bc755 100644 (file)
--- a/drivers/nvme/host/ioctl.c
+++ b/drivers/nvme/host/ioctl.c
@@ -421,10 +421,13 @@ static enum rq_end_io_ret nvme_uring_cmd_end_io(struct request *req,
        struct io_uring_cmd *ioucmd = req->end_io_data;
        struct nvme_uring_cmd_pdu *pdu = nvme_uring_cmd_pdu(ioucmd);
 
-       if (nvme_req(req)->flags & NVME_REQ_CANCELLED)
+       if (nvme_req(req)->flags & NVME_REQ_CANCELLED) {
                pdu->status = -EINTR;
-       else
+       } else {
                pdu->status = nvme_req(req)->status;
+               if (!pdu->status)
+                       pdu->status = blk_status_to_errno(err);
+       }
        pdu->result = le64_to_cpu(nvme_req(req)->result.u64);
 
        /*