io_uring: don't skip file_end_write() on reissue
authorPavel Begunkov <asml.silence@gmail.com>
Mon, 22 Mar 2021 01:45:59 +0000 (01:45 +0000)
committerJens Axboe <axboe@kernel.dk>
Mon, 22 Mar 2021 13:40:14 +0000 (07:40 -0600)
Don't miss to call kiocb_end_write() from __io_complete_rw() on reissue.
Shouldn't be much of a problem as the function actually does some work
only for ISREG, and NONBLOCK won't be reissued.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/32af9b77c5b874e1bee1a3c46396094bd969e577.1616366969.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 50acd6dfd966a755c1bff3f07743dd8c9de06c0c..a664b44a5a9452056caab8cbec9ef8c0f6fcd1ea 100644 (file)
@@ -2524,13 +2524,12 @@ static void __io_complete_rw(struct io_kiocb *req, long res, long res2,
 {
        int cflags = 0;
 
+       if (req->rw.kiocb.ki_flags & IOCB_WRITE)
+               kiocb_end_write(req);
        if ((res == -EAGAIN || res == -EOPNOTSUPP) && io_rw_reissue(req))
                return;
        if (res != req->result)
                req_set_fail_links(req);
-
-       if (req->rw.kiocb.ki_flags & IOCB_WRITE)
-               kiocb_end_write(req);
        if (req->flags & REQ_F_BUFFER_SELECTED)
                cflags = io_put_rw_kbuf(req);
        __io_req_complete(req, issue_flags, res, cflags);