From: Pavel Begunkov Date: Mon, 4 Oct 2021 19:02:59 +0000 (+0100) Subject: io_uring: inline io_poll_complete X-Git-Tag: v6.6.17~9008^2~43 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb6e6f0690c846f7de46181bab3954c12c96e11e;p=platform%2Fkernel%2Flinux-rpi.git io_uring: inline io_poll_complete Inline io_poll_complete(), it's simple and doesn't have any particular purpose. Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/933d7ee3e4450749a2d892235462c8f18d030293.1633373302.git.asml.silence@gmail.com Signed-off-by: Jens Axboe --- diff --git a/fs/io_uring.c b/fs/io_uring.c index dc83eff..815a7ec 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5292,16 +5292,6 @@ static bool __io_poll_complete(struct io_kiocb *req, __poll_t mask) return !(flags & IORING_CQE_F_MORE); } -static inline bool io_poll_complete(struct io_kiocb *req, __poll_t mask) - __must_hold(&req->ctx->completion_lock) -{ - bool done; - - done = __io_poll_complete(req, mask); - io_commit_cqring(req->ctx); - return done; -} - static void io_poll_task_func(struct io_kiocb *req, bool *locked) { struct io_ring_ctx *ctx = req->ctx; @@ -5791,7 +5781,8 @@ static int io_poll_add(struct io_kiocb *req, unsigned int issue_flags) if (mask) { /* no async, we'd stolen it */ ipt.error = 0; - done = io_poll_complete(req, mask); + done = __io_poll_complete(req, mask); + io_commit_cqring(req->ctx); } spin_unlock(&ctx->completion_lock);