io_uring: inline linked part of io_req_find_next

Inline part of __io_req_find_next() that returns a request but doesn't
need io_disarm_next(). It's just two places, but makes links a bit
faster.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/4126d13f23d0e91b39b3558e16bd86cafa7fcef2.1631115443.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 43ed9f6..10dd358 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2074,40 +2074,39 @@ static bool io_disarm_next(struct io_kiocb *req)
        return posted;
 }
 
-static struct io_kiocb *__io_req_find_next(struct io_kiocb *req)
+static void __io_req_find_next_prep(struct io_kiocb *req)
+{
+       struct io_ring_ctx *ctx = req->ctx;
+       bool posted;
+
+       spin_lock(&ctx->completion_lock);
+       posted = io_disarm_next(req);
+       if (posted)
+               io_commit_cqring(req->ctx);
+       spin_unlock(&ctx->completion_lock);
+       if (posted)
+               io_cqring_ev_posted(ctx);
+}
+
+static inline struct io_kiocb *io_req_find_next(struct io_kiocb *req)
 {
        struct io_kiocb *nxt;
 
+       if (likely(!(req->flags & (REQ_F_LINK|REQ_F_HARDLINK))))
+               return NULL;
        /*
         * If LINK is set, we have dependent requests in this chain. If we
         * didn't fail this request, queue the first one up, moving any other
         * dependencies to the next request. In case of failure, fail the rest
         * of the chain.
         */
-       if (req->flags & IO_DISARM_MASK) {
-               struct io_ring_ctx *ctx = req->ctx;
-               bool posted;
-
-               spin_lock(&ctx->completion_lock);
-               posted = io_disarm_next(req);
-               if (posted)
-                       io_commit_cqring(req->ctx);
-               spin_unlock(&ctx->completion_lock);
-               if (posted)
-                       io_cqring_ev_posted(ctx);
-       }
+       if (unlikely(req->flags & IO_DISARM_MASK))
+               __io_req_find_next_prep(req);
        nxt = req->link;
        req->link = NULL;
        return nxt;
 }
 
-static inline struct io_kiocb *io_req_find_next(struct io_kiocb *req)
-{
-       if (likely(!(req->flags & (REQ_F_LINK|REQ_F_HARDLINK))))
-               return NULL;
-       return __io_req_find_next(req);
-}
-
 static void ctx_flush_and_put(struct io_ring_ctx *ctx, bool *locked)
 {
        if (!ctx)