diff options
| author | Keith Busch <[email protected]> | 2024-10-28 13:45:46 -0700 |
|---|---|---|
| committer | Keith Busch <[email protected]> | 2024-10-30 07:19:18 -0700 |
| commit | 5eed4fb274cd6579f2fb4190b11c4c86c553cd06 (patch) | |
| tree | a6a127becbf4274e22a8aaf8d7ad56c1d1e84867 | |
| parent | d2f551b1f72b4c508ab9298419f6feadc3b5d791 (diff) | |
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: [email protected]
Reported-by: Jens Axboe <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Reviewed-by: Anuj Gupta <[email protected]>
Reviewed-by: Kanchan Joshi <[email protected]>
Signed-off-by: Keith Busch <[email protected]>
| -rw-r--r-- | drivers/nvme/host/ioctl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index b9b79ccfabf8..a96976b22fa7 100644 --- 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); /* |