This is only used inside io_req_find_next. Inline it and drop the helper. Signed-off-by: Gabriel Krisman Bertazi <krisman@xxxxxxx> --- io_uring/io_uring.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index a8cbe674e5d6..57d8947ae69e 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -989,15 +989,6 @@ __cold void io_free_req(struct io_kiocb *req) io_req_task_work_add(req); } -static void __io_req_find_next_prep(struct io_kiocb *req) -{ - struct io_ring_ctx *ctx = req->ctx; - - spin_lock(&ctx->completion_lock); - io_disarm_next(req); - spin_unlock(&ctx->completion_lock); -} - static inline struct io_kiocb *io_req_find_next(struct io_kiocb *req) { struct io_kiocb *nxt; @@ -1008,8 +999,11 @@ static inline struct io_kiocb *io_req_find_next(struct io_kiocb *req) * dependencies to the next request. In case of failure, fail the rest * of the chain. */ - if (unlikely(req->flags & IO_DISARM_MASK)) - __io_req_find_next_prep(req); + if (unlikely(req->flags & IO_DISARM_MASK)) { + spin_lock(&req->ctx->completion_lock); + io_disarm_next(req); + spin_unlock(&req->ctx->completion_lock); + } nxt = req->link; req->link = NULL; return nxt; -- 2.47.0