diff options
author | Pavel Begunkov <asml.silence@gmail.com> | 2020-10-20 23:50:27 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-01 12:47:09 +0100 |
commit | 753456ece6b47718e2cbde595d3f43b82ef1ebf6 (patch) | |
tree | 3461ecf3bbc335ffe675316532f75b52035afaff | |
parent | 4683c5407bd5ed473063993b7593f5d8084daceb (diff) | |
download | linux-stable-753456ece6b47718e2cbde595d3f43b82ef1ebf6.tar.gz linux-stable-753456ece6b47718e2cbde595d3f43b82ef1ebf6.tar.bz2 linux-stable-753456ece6b47718e2cbde595d3f43b82ef1ebf6.zip |
io_uring: don't reuse linked_timeout
commit ff5771613cd7b3a76cd16cb54aa81d30d3c11d48 upstream.
Clear linked_timeout for next requests in __io_queue_sqe() so we won't
queue it up unnecessary when it's going to be punted.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Cc: stable@vger.kernel.org # v5.9
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | fs/io_uring.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index f333ead8dc4e..59ab8c5c2aaa 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -6249,8 +6249,10 @@ err: if (nxt) { req = nxt; - if (req->flags & REQ_F_FORCE_ASYNC) + if (req->flags & REQ_F_FORCE_ASYNC) { + linked_timeout = NULL; goto punt; + } goto again; } exit: |