From dc6a394ef9ea2e7eae97b80af6f426ad4fbe52d2 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 6 May 2022 08:57:25 +0200 Subject: [PATCH] use nvme_finish_user_metadata --- drivers/nvme/host/ioctl.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index 0e05ef556627..0fd6850c0213 100644 --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -375,14 +375,9 @@ static void nvme_uring_task_cb(struct io_uring_cmd *ioucmd) result = le64_to_cpu(nvme_req(req)->result.u64); - if (pdu->meta) { - bool write = req_op(req) == REQ_OP_DRV_OUT; - - if (!status && !write && - copy_to_user(pdu->meta_buffer, pdu->meta, pdu->meta_len)) - status = -EFAULT; - kfree(pdu->meta); - } + if (pdu->meta) + status = nvme_finish_user_metadata(req, pdu->meta_buffer, + pdu->meta, pdu->meta_len, status); if (bio) blk_rq_unmap_user(bio); blk_mq_free_request(req); -- 2.50.1