From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 03/13] io_uring: reuse io_req_task_queue_fail()
Date: Tue, 23 Feb 2021 01:55:38 +0000 [thread overview]
Message-ID: <f654607fd5fbcbabecbd81b74a2fea2d14fe5b98.1614045169.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Use io_req_task_queue_fail() on the fail path of io_req_task_queue().
It's unlikely to happen, so don't care about additional overhead, but
allows to keep all the req->result invariant in a single function.
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 2d66d0afc6c0..aa2ad863af96 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2036,25 +2036,21 @@ static void io_req_task_submit(struct callback_head *cb)
__io_req_task_submit(req);
}
-static void io_req_task_queue(struct io_kiocb *req)
+static void io_req_task_queue_fail(struct io_kiocb *req, int ret)
{
- int ret;
+ req->result = ret;
+ req->task_work.func = io_req_task_cancel;
- req->task_work.func = io_req_task_submit;
- ret = io_req_task_work_add(req);
- if (unlikely(ret)) {
- req->result = -ECANCELED;
+ if (unlikely(io_req_task_work_add(req)))
io_req_task_work_add_fallback(req, io_req_task_cancel);
- }
}
-static void io_req_task_queue_fail(struct io_kiocb *req, int ret)
+static void io_req_task_queue(struct io_kiocb *req)
{
- req->result = ret;
- req->task_work.func = io_req_task_cancel;
+ req->task_work.func = io_req_task_submit;
if (unlikely(io_req_task_work_add(req)))
- io_req_task_work_add_fallback(req, io_req_task_cancel);
+ io_req_task_queue_fail(req, -ECANCELED);
}
static inline void io_queue_next(struct io_kiocb *req)
--
2.24.0
next prev parent reply other threads:[~2021-02-23 2:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 1:55 [PATCH for-next 00/13] simple 5.13 cleanups Pavel Begunkov
2021-02-23 1:55 ` [PATCH 01/13] io_uring: introduce a new helper for ctx quiesce Pavel Begunkov
2021-02-23 1:55 ` [PATCH 02/13] io_uring: avoid taking ctx refs for task-cancel Pavel Begunkov
2021-02-23 1:55 ` Pavel Begunkov [this message]
2021-02-23 1:55 ` [PATCH 04/13] io_uring: further deduplicate file slot selection Pavel Begunkov
2021-02-23 1:55 ` [PATCH 05/13] io_uring: add a helper failing not issued requests Pavel Begunkov
2021-02-23 1:55 ` [PATCH 06/13] io_uring: refactor provide/remove buffer locking Pavel Begunkov
2021-02-23 1:55 ` [PATCH 07/13] io_uring: don't restirct issue_flags for io_openat Pavel Begunkov
2021-02-23 1:55 ` [PATCH 08/13] io_uring: use better types for cflags Pavel Begunkov
2021-02-23 1:55 ` [PATCH 09/13] io_uring: refactor out send/recv async setup Pavel Begunkov
2021-02-23 1:55 ` [PATCH 10/13] io_uring: untie alloc_async_data and needs_async_data Pavel Begunkov
2021-02-23 1:55 ` [PATCH 11/13] io_uring: rethink def->needs_async_data Pavel Begunkov
2021-02-23 1:55 ` [PATCH 12/13] io_uring: merge defer_prep() and prep_async() Pavel Begunkov
2021-02-23 1:55 ` [PATCH 13/13] io_uring: simplify io_resubmit_prep() 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=f654607fd5fbcbabecbd81b74a2fea2d14fe5b98.1614045169.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