From: Pavel Begunkov <asml.silence@gmail.com>
Date: Thu, 16 Jun 2022 09:22:04 +0000 (+0100)
Subject: io_uring: clean up io_try_cancel
X-Git-Tag: v6.1-rc5~771^2~96
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4dfab8abb4721da278a2ccd45c1b6a69f8a9dd14;p=platform%2Fkernel%2Flinux-starfive.git

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: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/48cf5417b43a8386c6c364dba1ad9b4c7382d158.1655371007.git.asml.silence@gmail.com
Reviewed-by: Hao Xu <howeyxu@tencent.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/io_uring/cancel.c b/io_uring/cancel.c
index 6f28883..a253e2a 100644
--- a/io_uring/cancel.c
+++ b/io_uring/cancel.c
@@ -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;
 }