diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2020-07-25 14:41:59 +0300 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2020-07-25 09:47:44 -0600 |
| commit | f063c5477eb392c315aa25ad538b4920b367ea05 (patch) | |
| tree | 2effa5edab4a54a0637df9390bffc3e094b60aeb /fs/io_uring.c | |
| parent | io_uring: mark ->work uninitialised after cleanup (diff) | |
| download | linux-dev-f063c5477eb392c315aa25ad538b4920b367ea05.tar.xz linux-dev-f063c5477eb392c315aa25ad538b4920b367ea05.zip | |
io_uring: fix missing io_queue_linked_timeout()
Whoever called io_prep_linked_timeout() should also do
io_queue_linked_timeout(). __io_queue_sqe() doesn't follow that for the
punting path leaving linked timeouts prepared but never queued.
Fixes: 6df1db6b54243 ("io_uring: fix mis-refcounting linked timeouts")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 59f1f473ffc7..3e406bc1f855 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5987,20 +5987,20 @@ again: * doesn't support non-blocking read/write attempts */ if (ret == -EAGAIN && !(req->flags & REQ_F_NOWAIT)) { - if (io_arm_poll_handler(req)) { - if (linked_timeout) - io_queue_linked_timeout(linked_timeout); - goto exit; - } + if (!io_arm_poll_handler(req)) { punt: - ret = io_prep_work_files(req); - if (unlikely(ret)) - goto err; - /* - * Queued up for async execution, worker will release - * submit reference when the iocb is actually submitted. - */ - io_queue_async_work(req); + ret = io_prep_work_files(req); + if (unlikely(ret)) + goto err; + /* + * Queued up for async execution, worker will release + * submit reference when the iocb is actually submitted. + */ + io_queue_async_work(req); + } + + if (linked_timeout) + io_queue_linked_timeout(linked_timeout); goto exit; } |