From: Hao Xu <[email protected]>
To: Jens Axboe <[email protected]>
Cc: [email protected], Pavel Begunkov <[email protected]>,
Joseph Qi <[email protected]>
Subject: [PATCH 3/3] io_uring: move fail path of request submittion to the end
Date: Wed, 18 Aug 2021 15:43:16 +0800 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
Move the fail path of request submittion to the end of the function to
make the logic more readable.
Signed-off-by: Hao Xu <[email protected]>
---
fs/io_uring.c | 40 +++++++++++++++++++++-------------------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 383668e07417..5eb09ca4a0a7 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -6639,25 +6639,8 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
head = link->head;
ret = io_init_req(ctx, req, sqe);
- if (unlikely(ret)) {
-fail_req:
- req->result = ret;
- if (head) {
- link->last = req;
- if (is_link) {
- req_set_fail(head);
- } else {
- int res = head->result ? head->result : -ECANCELED;
-
- link->head = NULL;
- /* fail even hard links since we don't submit */
- io_req_complete_failed(head, res);
- }
- } else {
- io_req_complete_failed(req, ret);
- }
- return ret;
- }
+ if (unlikely(ret))
+ goto fail_req;
ret = io_req_prep(req, sqe);
if (unlikely(ret))
@@ -6698,6 +6681,25 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
}
return 0;
+
+fail_req:
+ if (head) {
+ req->result = ret;
+ link->last = req;
+ if (is_link) {
+ req_set_fail(head);
+ } else {
+ int res = head->result ? head->result : -ECANCELED;
+
+ link->head = NULL;
+ /* fail even hard links since we don't submit */
+ io_req_complete_failed(head, res);
+ }
+ } else {
+ io_req_complete_failed(req, ret);
+ }
+
+ return ret;
}
/*
--
2.24.4
prev parent reply other threads:[~2021-08-18 7:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-18 7:43 [PATCH for-5.15 0/3] fix failed linkchain code logic Hao Xu
2021-08-18 7:43 ` [PATCH 1/3] io_uring: remove redundant req_set_fail() Hao Xu
2021-08-18 7:43 ` [PATCH 2/3] io_uring: fix failed linkchain code logic Hao Xu
2021-08-18 10:20 ` Pavel Begunkov
2021-08-18 12:22 ` Hao Xu
2021-08-18 14:40 ` Pavel Begunkov
2021-08-19 10:30 ` Hao Xu
2021-08-18 7:43 ` Hao Xu [this message]
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 \
[email protected] \
[email protected] \
[email protected] \
[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