summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2020-05-17 14:02:12 +0300
committerJens Axboe <axboe@kernel.dk>2020-05-17 09:22:09 -0600
commitbd2ab18a1d6267446eae1b47dd839050452bdf7f (patch)
treea96b6c95160221a2350d61b820030c5a6ccb5fba /fs
parent650b548129b60b0d23508351800108196f4aa89f (diff)
downloadlinux-bd2ab18a1d6267446eae1b47dd839050452bdf7f.tar.bz2
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/io_uring.c12
1 files changed, 9 insertions, 3 deletions
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.