diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2021-11-02 14:38:52 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-11-02 09:26:14 -0600 |
| commit | 9881024aab8094a53756c7aee42564306c8e3580 (patch) | |
| tree | 31d29d9e1c22735f0360bac170d714acc72b4b35 /fs/io_uring.c | |
| parent | bfc484fe6abba4b89ec9330e0e68778e2a9856b2 (diff) | |
| download | linux-9881024aab8094a53756c7aee42564306c8e3580.tar.bz2 | |
io_uring: clean up io_queue_sqe_arm_apoll
The fix for linked timeout unprep got a bit distored with two rebases,
handle linked timeouts for IO_APOLL_READY as with all other cases, i.e.
queue it at the end of the function.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/130b1ea5605bbd81d7b874a95332295799d33b81.1635863773.git.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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 3ecd4b51510e..61c962c29235 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -6950,10 +6950,6 @@ static void io_queue_sqe_arm_apoll(struct io_kiocb *req) switch (io_arm_poll_handler(req)) { case IO_APOLL_READY: - if (linked_timeout) { - io_queue_linked_timeout(linked_timeout); - linked_timeout = NULL; - } io_req_task_queue(req); break; case IO_APOLL_ABORTED: |