From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 2/4] io_uring: pass only !null to io_req_find_next()
Date: Thu, 21 Nov 2019 23:21:01 +0300 [thread overview]
Message-ID: <a483916f68d74ff4a27c7b3719fbe6a83612a4f0.1574366549.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Make io_req_find_next() and io_req_link_next() to accept only non-null
nxt, and handle it in callers.
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 07b48ce3ccab..63ef603d5fa0 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -903,7 +903,7 @@ static void io_req_link_next(struct io_kiocb *req, struct io_kiocb **nxtptr)
* in this context instead of having to queue up new async work.
*/
if (nxt) {
- if (nxtptr && io_wq_current_is_worker())
+ if (io_wq_current_is_worker())
*nxtptr = nxt;
else
io_queue_async_work(nxt);
@@ -981,8 +981,13 @@ static void io_req_find_next(struct io_kiocb *req, struct io_kiocb **nxt)
static void io_free_req(struct io_kiocb *req)
{
- io_req_find_next(req, NULL);
+ struct io_kiocb *nxt = NULL;
+
+ io_req_find_next(req, &nxt);
__io_free_req(req);
+
+ if (nxt)
+ io_queue_async_work(nxt);
}
/*
--
2.24.0
next prev parent reply other threads:[~2019-11-21 20:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 20:20 [RFC PATCH 0/4] cleanup io_put/free Pavel Begunkov
2019-11-21 20:21 ` [PATCH 1/4] io_uring: remove io_free_req_find_next() Pavel Begunkov
2019-11-21 20:21 ` Pavel Begunkov [this message]
2019-11-21 20:21 ` [PATCH 3/4] io_uring: simplify io_req_link_next() Pavel Begunkov
2019-11-21 20:21 ` [PATCH 4/4] io_uring: only !null ptr to io_issue_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=a483916f68d74ff4a27c7b3719fbe6a83612a4f0.1574366549.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