Commit 4dfab8ab authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: clean up io_try_cancel 



Get rid of an unnecessary extra goto in io_try_cancel() and simplify the
function.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/48cf5417b43a8386c6c364dba1ad9b4c7382d158.1655371007.git.asml.silence@gmail.com


Reviewed-by: default avatarHao Xu <howeyxu@tencent.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1ab1edb0

io_uring/cancel.c

+2 −2
Original line number Diff line number Diff line
@@ -95,12 +95,12 @@ int io_try_cancel(struct io_kiocb *req, struct io_cancel_data *cd) 


	ret = io_poll_cancel(ctx, cd);

	if (ret != -ENOENT)

		goto out;

		return ret;



	spin_lock(&ctx->completion_lock);

	if (!(cd->flags & IORING_ASYNC_CANCEL_FD))

		ret = io_timeout_cancel(ctx, cd);

	spin_unlock(&ctx->completion_lock);

out:

	return ret;

}