public inbox for io-uring@vger.kernel.org
 help / color / mirror / Atom feed
From: Pavel Begunkov <asml.silence@gmail.com>
To: io-uring@vger.kernel.org
Cc: asml.silence@gmail.com
Subject: [PATCH 2/6] io_uring: simplify drain ret passing
Date: Thu,  8 May 2025 12:52:22 +0100	[thread overview]
Message-ID: <af14f58cecc55b078959cdac93cdaaa7822b3c3f.1746702098.git.asml.silence@gmail.com> (raw)
In-Reply-To: <cover.1746702098.git.asml.silence@gmail.com>

"ret" in io_drain_req() is only used in one place, remove it and pass
-ENOMEM directly.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 io_uring/io_uring.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 23e283e65eeb..21b70ad0edc4 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1657,7 +1657,6 @@ static __cold void io_drain_req(struct io_kiocb *req)
 {
 	struct io_ring_ctx *ctx = req->ctx;
 	struct io_defer_entry *de;
-	int ret;
 	u32 seq = io_get_sequence(req);
 
 	/* Still need defer if there is pending req in defer list. */
@@ -1674,8 +1673,7 @@ static __cold void io_drain_req(struct io_kiocb *req)
 	io_prep_async_link(req);
 	de = kmalloc(sizeof(*de), GFP_KERNEL_ACCOUNT);
 	if (!de) {
-		ret = -ENOMEM;
-		io_req_defer_failed(req, ret);
+		io_req_defer_failed(req, -ENOMEM);
 		return;
 	}
 
-- 
2.49.0


  parent reply	other threads:[~2025-05-08 11:51 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-08 11:52 [PATCH 0/6] drain cleanups and extra Pavel Begunkov
2025-05-08 11:52 ` [PATCH 1/6] io_uring: account drain memory to cgroup Pavel Begunkov
2025-05-08 11:52 ` Pavel Begunkov [this message]
2025-05-08 11:52 ` [PATCH 3/6] io_uring: remove drain prealloc checks Pavel Begunkov
2025-05-08 11:52 ` [PATCH 4/6] io_uring: consolidate drain seq checking Pavel Begunkov
2025-05-08 15:43   ` Pavel Begunkov
2025-05-08 11:52 ` [PATCH 5/6] io_uring/net: move CONFIG_NET guards to Makefile Pavel Begunkov
2025-05-08 11:52 ` [PATCH 6/6] io_uring: add lockdep asserts to io_add_aux_cqe Pavel Begunkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=af14f58cecc55b078959cdac93cdaaa7822b3c3f.1746702098.git.asml.silence@gmail.com \
    --to=asml.silence@gmail.com \
    --cc=io-uring@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox