From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 2/3] io_uring: simplify nxt propagation in io_queue_sqe
Date: Thu, 22 Oct 2020 16:47:17 +0100 [thread overview]
Message-ID: <1dffbb4d59e8234254cd26c7f55f8bc3c859772b.1603381526.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Don't overuse goto's, complex control flow doesn't make compilers happy
and makes code harder to read.
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 9aeaa6f4a593..05b30212d9e6 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -6208,7 +6208,6 @@ static void __io_queue_sqe(struct io_kiocb *req, struct io_comp_state *cs)
*/
if (ret == -EAGAIN && !(req->flags & REQ_F_NOWAIT)) {
if (!io_arm_poll_handler(req)) {
-punt:
/*
* Queued up for async execution, worker will release
* submit reference when the iocb is actually submitted.
@@ -6237,12 +6236,9 @@ static void __io_queue_sqe(struct io_kiocb *req, struct io_comp_state *cs)
if (nxt) {
req = nxt;
-
- if (req->flags & REQ_F_FORCE_ASYNC) {
- linked_timeout = NULL;
- goto punt;
- }
- goto again;
+ if (!(req->flags & REQ_F_FORCE_ASYNC))
+ goto again;
+ io_queue_async_work(req);
}
exit:
if (old_creds)
--
2.24.0
next prev parent reply other threads:[~2020-10-22 15:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-22 15:47 [PATCH 0/3] __io_queue_sqe() cleanups Pavel Begunkov
2020-10-22 15:47 ` [PATCH 1/3] io_uring: don't miss setting IO_WQ_WORK_CONCURRENT Pavel Begunkov
2020-10-22 15:47 ` Pavel Begunkov [this message]
2020-10-22 15:47 ` [PATCH 3/3] io_uring: simplify __io_queue_sqe() 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=1dffbb4d59e8234254cd26c7f55f8bc3c859772b.1603381526.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
[email protected] \
/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