Commit 9881024a authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

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: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/130b1ea5605bbd81d7b874a95332295799d33b81.1635863773.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent bfc484fe

fs/io_uring.c

+0 −4
Original line number Diff line number Diff line
@@ -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: