All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dylan Yudaken <dylany@meta.com>
To: Jens Axboe <axboe@kernel.dk>, Pavel Begunkov <asml.silence@gmail.com>
Cc: <io-uring@vger.kernel.org>, <kernel-team@fb.com>,
	Dylan Yudaken <dylany@meta.com>
Subject: [PATCH for-next 3/3] io_uring: Revert "io_uring: io_req_complete_post should defer if available"
Date: Fri, 25 Nov 2022 02:34:12 -0800	[thread overview]
Message-ID: <20221125103412.1425305-4-dylany@meta.com> (raw)
In-Reply-To: <20221125103412.1425305-1-dylany@meta.com>

This is not needed, as everywhere that calls io_req_complete_post
already knows it will not be deferring.

This reverts commit 8fa737e0de7d3c4dc3d7cb9a9d9a6362d872c3f3.

Signed-off-by: Dylan Yudaken <dylany@meta.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 c1e84ef84bea..d9c9e347346d 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -908,9 +908,7 @@ static void __io_req_complete_post(struct io_kiocb *req)
 
 void io_req_complete_post(struct io_kiocb *req, unsigned issue_flags)
 {
-	if (issue_flags & IO_URING_F_COMPLETE_DEFER) {
-		io_req_complete_defer(req);
-	} else if (!(issue_flags & IO_URING_F_UNLOCKED) ||
+	if (!(issue_flags & IO_URING_F_UNLOCKED) ||
 	    !(req->ctx->flags & IORING_SETUP_IOPOLL)) {
 		__io_req_complete_post(req);
 	} else {
-- 
2.30.2


  parent reply	other threads:[~2022-11-25 10:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-25 10:34 [PATCH for-next 0/3] io_uring: completion cleanups Dylan Yudaken
2022-11-25 10:34 ` [PATCH for-next 1/3] io_uring: remove io_req_complete_post_tw Dylan Yudaken
2022-11-25 10:34 ` [PATCH for-next 2/3] io_uring: spelling fix Dylan Yudaken
2022-11-25 10:34 ` Dylan Yudaken [this message]
2022-11-25 13:13 ` (subset) [PATCH for-next 0/3] io_uring: completion cleanups Jens Axboe

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=20221125103412.1425305-4-dylany@meta.com \
    --to=dylany@meta.com \
    --cc=asml.silence@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=io-uring@vger.kernel.org \
    --cc=kernel-team@fb.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.