io_uring: improve argument types of kiocb_done()

kiocb_done() accepts a pointer to struct kiocb, pass struct io_kiocb
(i.e. io_uring's request) instead so we can get rid of useless
container_of().

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/252016eed77806f58b48251a85cd8c645f900433.1637524285.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index a65fb9cd9db7344f11864c7477439a6f0d3a2122..86847eac3a99f2bddebfe879ef6363cff416cf6c 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2922,10 +2922,9 @@ static inline void io_rw_done(struct kiocb *kiocb, ssize_t ret)
        }
 }
 
-static void kiocb_done(struct kiocb *kiocb, ssize_t ret,
+static void kiocb_done(struct io_kiocb *req, ssize_t ret,
                       unsigned int issue_flags)
 {
-       struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw.kiocb);
        struct io_async_rw *io = req->async_data;
 
        /* add previously done IO, if any */
@@ -2937,11 +2936,11 @@ static void kiocb_done(struct kiocb *kiocb, ssize_t ret,
        }
 
        if (req->flags & REQ_F_CUR_POS)
-               req->file->f_pos = kiocb->ki_pos;
-       if (ret >= 0 && (kiocb->ki_complete == io_complete_rw))
+               req->file->f_pos = req->rw.kiocb.ki_pos;
+       if (ret >= 0 && (req->rw.kiocb.ki_complete == io_complete_rw))
                __io_complete_rw(req, ret, 0, issue_flags);
        else
-               io_rw_done(kiocb, ret);
+               io_rw_done(&req->rw.kiocb, ret);
 
        if (req->flags & REQ_F_REISSUE) {
                req->flags &= ~REQ_F_REISSUE;
@@ -3584,7 +3583,7 @@ static int io_read(struct io_kiocb *req, unsigned int issue_flags)
                iov_iter_restore(&s->iter, &s->iter_state);
        } while (ret > 0);
 done:
-       kiocb_done(kiocb, ret, issue_flags);
+       kiocb_done(req, ret, issue_flags);
 out_free:
        /* it's faster to check here then delegate to kfree */
        if (iovec)
@@ -3681,7 +3680,7 @@ static int io_write(struct io_kiocb *req, unsigned int issue_flags)
                if (ret2 == -EAGAIN && (req->ctx->flags & IORING_SETUP_IOPOLL))
                        goto copy_iov;
 done:
-               kiocb_done(kiocb, ret2, issue_flags);
+               kiocb_done(req, ret2, issue_flags);
        } else {
 copy_iov:
                iov_iter_restore(&s->iter, &s->iter_state);