From: Pavel Begunkov Date: Mon, 24 Mar 2025 15:32:34 +0000 (+0000) Subject: io_uring: open code __io_post_aux_cqe() X-Git-Tag: v6.15-rc1~122^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c76de42cb6971fc2cc7984ed974caffe6ea7fda;p=thirdparty%2Fkernel%2Flinux.git io_uring: open code __io_post_aux_cqe() There is no reason to keep __io_post_aux_cqe() separately from io_post_aux_cqe(). Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/2c4c1f68d694deea25a212fc09bbb11f330cd82e.1742829388.git.asml.silence@gmail.com Signed-off-by: Jens Axboe --- diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 1fcfe62cecd98..df3685803ef77 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -834,24 +834,14 @@ static bool io_fill_cqe_aux(struct io_ring_ctx *ctx, u64 user_data, s32 res, return false; } -static bool __io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, - u32 cflags) +bool io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags) { bool filled; + io_cq_lock(ctx); filled = io_fill_cqe_aux(ctx, user_data, res, cflags); if (!filled) filled = io_cqring_event_overflow(ctx, user_data, res, cflags, 0, 0); - - return filled; -} - -bool io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags) -{ - bool filled; - - io_cq_lock(ctx); - filled = __io_post_aux_cqe(ctx, user_data, res, cflags); io_cq_unlock_post(ctx); return filled; }