From: Pavel Begunkov <asml.silence@gmail.com>
Date: Sun, 17 May 2020 11:02:12 +0000 (+0300)
Subject: io_uring: fix FORCE_ASYNC req preparation
X-Git-Tag: io_uring-5.7-2020-05-22~5
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=bd2ab18a1d6267446eae1b47dd839050452bdf7f;p=linux-block.git

io_uring: fix FORCE_ASYNC req preparation

As for other not inlined requests, alloc req->io for FORCE_ASYNC reqs,
so they can be prepared properly.

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 51be07390634..f18cd98be783 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -5608,9 +5608,15 @@ fail_req:
 			io_double_put_req(req);
 		}
 	} else if (req->flags & REQ_F_FORCE_ASYNC) {
-		ret = io_req_defer_prep(req, sqe);
-		if (unlikely(ret < 0))
-			goto fail_req;
+		if (!req->io) {
+			ret = -EAGAIN;
+			if (io_alloc_async_ctx(req))
+				goto fail_req;
+			ret = io_req_defer_prep(req, sqe);
+			if (unlikely(ret < 0))
+				goto fail_req;
+		}
+
 		/*
 		 * Never try inline submit of IOSQE_ASYNC is set, go straight
 		 * to async execution.