io_uring: fix provided buffer return on failure for kiocb_done()

Use io_req_complete_failed() in kiocb_done(). This cleans up the code,
but also ensures that a provided buffers is correctly freed on failure.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/a4880106fcf199d5810707fe2d17126fcdf18bc4.1647481208.git.asml.silence@gmail.com
[axboe: split from previous patch]
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index a90844bf9b9c843018f742b592a908492b890d2d..f039706bce0e938dce048eb63fbdd190619f10be 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3242,14 +3242,10 @@ static void kiocb_done(struct io_kiocb *req, ssize_t ret,
 
        if (req->flags & REQ_F_REISSUE) {
                req->flags &= ~REQ_F_REISSUE;
-               if (io_resubmit_prep(req)) {
+               if (io_resubmit_prep(req))
                        io_req_task_queue_reissue(req);
-               } else {
-                       req_set_fail(req);
-                       req->result = ret;
-                       req->io_task_work.func = io_req_task_complete;
-                       io_req_task_work_add(req, false);
-               }
+               else
+                       io_req_task_queue_fail(req, ret);
        }
 }