Skip to content

Commit 9881024

Browse files
isilenceaxboe
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/130b1ea5605bbd81d7b874a95332295799d33b81.1635863773.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <[email protected]>
1 parent bfc484f commit 9881024

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

fs/io_uring.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6950,10 +6950,6 @@ static void io_queue_sqe_arm_apoll(struct io_kiocb *req)
69506950

69516951
switch (io_arm_poll_handler(req)) {
69526952
case IO_APOLL_READY:
6953-
if (linked_timeout) {
6954-
io_queue_linked_timeout(linked_timeout);
6955-
linked_timeout = NULL;
6956-
}
69576953
io_req_task_queue(req);
69586954
break;
69596955
case IO_APOLL_ABORTED:

0 commit comments

Comments
 (0)