From: Pavel Begunkov Date: Fri, 23 Jun 2023 11:23:28 +0000 (+0100) Subject: io_uring: fix acquire/release annotations X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=55b6a69fed5df6f88ef0b2ace562b422162beb61;p=linux.git io_uring: fix acquire/release annotations We do conditional locking, so __io_cq_lock() and friends not always actually grab/release the lock, so kill misleading annotations. Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/2a098f9144c24cab622f8bf90b39f44da5d0401e.1687518903.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 2f55abb676c07..8cb0f60d28856 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -626,7 +626,6 @@ void __io_commit_cqring_flush(struct io_ring_ctx *ctx) } static inline void __io_cq_lock(struct io_ring_ctx *ctx) - __acquires(ctx->completion_lock) { if (!ctx->task_complete) spin_lock(&ctx->completion_lock); @@ -646,7 +645,6 @@ static inline void io_cq_lock(struct io_ring_ctx *ctx) /* keep it inlined for io_submit_flush_completions() */ static inline void __io_cq_unlock_post(struct io_ring_ctx *ctx) - __releases(ctx->completion_lock) { io_commit_cqring(ctx); __io_cq_unlock(ctx); @@ -655,7 +653,6 @@ static inline void __io_cq_unlock_post(struct io_ring_ctx *ctx) } static void __io_cq_unlock_post_flush(struct io_ring_ctx *ctx) - __releases(ctx->completion_lock) { io_commit_cqring(ctx);