Commit 5eed4fb2 authored by Keith Busch's avatar Keith Busch
Browse files

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



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

Fixes: d6aacee9 ("nvme: use bio_integrity_map_user")
Cc: stable@vger.kernel.org
Reported-by: default avatarJens Axboe <axboe@kernel.dk>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent d2f551b1

drivers/nvme/host/ioctl.c

+5 −2
Original line number Diff line number Diff line
@@ -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);



	/*