From: Pavel Begunkov Date: Tue, 19 Jan 2021 13:32:38 +0000 (+0000) Subject: io_uring: inline __io_commit_cqring() X-Git-Tag: v5.15~1617^2~111 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec30e04ba4a5c265f52482092a5f5f5232947c48;p=platform%2Fkernel%2Flinux-starfive.git io_uring: inline __io_commit_cqring() Inline it in its only user, that's cleaner Signed-off-by: Pavel Begunkov Signed-off-by: Jens Axboe --- diff --git a/fs/io_uring.c b/fs/io_uring.c index 6eb4c25..347bdcd 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1364,14 +1364,6 @@ static bool req_need_defer(struct io_kiocb *req, u32 seq) return false; } -static void __io_commit_cqring(struct io_ring_ctx *ctx) -{ - struct io_rings *rings = ctx->rings; - - /* order cqe stores with ring update */ - smp_store_release(&rings->cq.tail, ctx->cached_cq_tail); -} - static void io_put_identity(struct io_uring_task *tctx, struct io_kiocb *req) { if (req->work.identity == &tctx->__identity) @@ -1693,7 +1685,9 @@ static void io_flush_timeouts(struct io_ring_ctx *ctx) static void io_commit_cqring(struct io_ring_ctx *ctx) { io_flush_timeouts(ctx); - __io_commit_cqring(ctx); + + /* order cqe stores with ring update */ + smp_store_release(&ctx->rings->cq.tail, ctx->cached_cq_tail); if (unlikely(!list_empty(&ctx->defer_list))) __io_queue_deferred(ctx);