mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
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>
This commit is contained in:
parent
bfc484fe6a
commit
9881024aab
1 changed files with 0 additions and 4 deletions
|
@ -6950,10 +6950,6 @@ static void io_queue_sqe_arm_apoll(struct io_kiocb *req)
|
||||||
|
|
||||||
switch (io_arm_poll_handler(req)) {
|
switch (io_arm_poll_handler(req)) {
|
||||||
case IO_APOLL_READY:
|
case IO_APOLL_READY:
|
||||||
if (linked_timeout) {
|
|
||||||
io_queue_linked_timeout(linked_timeout);
|
|
||||||
linked_timeout = NULL;
|
|
||||||
}
|
|
||||||
io_req_task_queue(req);
|
io_req_task_queue(req);
|
||||||
break;
|
break;
|
||||||
case IO_APOLL_ABORTED:
|
case IO_APOLL_ABORTED:
|
||||||
|
|
Loading…
Reference in a new issue