io_uring: simplify nxt propagation in io_queue_sqe
authorPavel Begunkov <asml.silence@gmail.com>
Thu, 22 Oct 2020 15:47:17 +0000 (16:47 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 23 Oct 2020 19:07:12 +0000 (13:07 -0600)
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>
fs/io_uring.c

index 3606ea5..4d647d9 100644 (file)
@@ -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)