From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 28 Mar 2024 16:42:40 +0000 (-0600)
Subject: io_uring/msg_ring: cleanup posting to IOPOLL vs !IOPOLL ring
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=59b28a6e37e650c0d601ed87875b6217140cda5d;p=linux.git

io_uring/msg_ring: cleanup posting to IOPOLL vs !IOPOLL ring

Move the posting outside the checking and locking, it's cleaner that
way.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/io_uring/msg_ring.c b/io_uring/msg_ring.c
index d74670b39ed6d..81c4a9d437296 100644
--- a/io_uring/msg_ring.c
+++ b/io_uring/msg_ring.c
@@ -147,13 +147,11 @@ static int io_msg_ring_data(struct io_kiocb *req, unsigned int issue_flags)
 	if (target_ctx->flags & IORING_SETUP_IOPOLL) {
 		if (unlikely(io_double_lock_ctx(target_ctx, issue_flags)))
 			return -EAGAIN;
-		if (io_post_aux_cqe(target_ctx, msg->user_data, msg->len, flags))
-			ret = 0;
-		io_double_unlock_ctx(target_ctx);
-	} else {
-		if (io_post_aux_cqe(target_ctx, msg->user_data, msg->len, flags))
-			ret = 0;
 	}
+	if (io_post_aux_cqe(target_ctx, msg->user_data, msg->len, flags))
+		ret = 0;
+	if (target_ctx->flags & IORING_SETUP_IOPOLL)
+		io_double_unlock_ctx(target_ctx);
 	return ret;
 }