From: Pavel Begunkov <asml.silence@gmail.com>
Date: Thu, 22 Oct 2020 15:47:17 +0000 (+0100)
Subject: io_uring: simplify nxt propagation in io_queue_sqe
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9aaf354352f1142831457492790d6bfa9c883021;p=linux.git

io_uring: simplify nxt propagation in io_queue_sqe

Don't overuse goto's, complex control flow doesn't make compilers happy
and makes code harder to read.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 3606ea572e615..4d647d91dab23 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -6188,7 +6188,6 @@ again:
 	 */
 	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.
@@ -6217,12 +6216,9 @@ punt:
 
 	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)