public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH for-next 17/25] io_uring: clean up io_try_cancel
Date: Tue, 14 Jun 2022 13:29:55 +0100	[thread overview]
Message-ID: <cba104fe32764135805425fbdf025a37dc871756.1655209709.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>

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

Signed-off-by: Pavel Begunkov <[email protected]>
---
 io_uring/cancel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/io_uring/cancel.c b/io_uring/cancel.c
index 54a5e0a86b61..2f157aebd3a0 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;
 }
 
-- 
2.36.1


  parent reply	other threads:[~2022-06-14 12:34 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-14 12:29 [PATCH for-next 00/25] 5.20 cleanups and poll optimisations Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 01/25] io_uring: make reg buf init consistent Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 02/25] io_uring: move defer_list to slow data Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 03/25] io_uring: better caching for ctx timeout fields Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 04/25] io_uring: refactor ctx slow data placement Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 05/25] io_uring: move cancel_seq out of io-wq Pavel Begunkov
2022-06-14 12:52   ` Jens Axboe
2022-06-14 13:01     ` Pavel Begunkov
2022-06-14 13:10       ` Jens Axboe
2022-06-14 12:29 ` [PATCH for-next 06/25] io_uring: move small helpers to headers Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 07/25] io_uring: inline ->registered_rings Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 08/25] io_uring: don't set REQ_F_COMPLETE_INLINE in tw Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 09/25] io_uring: never defer-complete multi-apoll Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 10/25] io_uring: kill REQ_F_COMPLETE_INLINE Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 11/25] io_uring: refactor io_req_task_complete() Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 12/25] io_uring: don't inline io_put_kbuf Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 13/25] io_uring: remove check_cq checking from hot paths Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 14/25] io_uring: poll: remove unnecessary req->ref set Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 15/25] io_uring: switch cancel_hash to use per entry spinlock Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 16/25] io_uring: pass poll_find lock back Pavel Begunkov
2022-06-14 12:29 ` Pavel Begunkov [this message]
2022-06-14 12:29 ` [PATCH for-next 18/25] io_uring: limit number hash buckets Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 19/25] io_uring: clean up io_ring_ctx_alloc Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 20/25] io_uring: use state completion infra for poll reqs Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 21/25] io_uring: add IORING_SETUP_SINGLE_ISSUER Pavel Begunkov
2022-06-14 12:56   ` Pavel Begunkov
2022-06-14 12:30 ` [PATCH for-next 22/25] io_uring: pass hash table into poll_find Pavel Begunkov
2022-06-14 12:30 ` [PATCH for-next 23/25] io_uring: introduce a struct for hash table Pavel Begunkov
2022-06-14 12:30 ` [PATCH for-next 24/25] io_uring: propagate locking state to poll cancel Pavel Begunkov
2022-06-14 12:30 ` [PATCH for-next 25/25] io_uring: mutex locked poll hashing Pavel Begunkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cba104fe32764135805425fbdf025a37dc871756.1655209709.git.asml.silence@gmail.com \
    [email protected] \
    [email protected] \
    [email protected] \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox