From: Jens Axboe <axboe@kernel.dk>
To: io-uring@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 6/6] io_uring/cancel: move __io_uring_cancel() into cancel.c
Date: Mon, 3 Nov 2025 11:48:03 -0700 [thread overview]
Message-ID: <20251103184937.61634-7-axboe@kernel.dk> (raw)
In-Reply-To: <20251103184937.61634-1-axboe@kernel.dk>
Yet another function that should be in cancel.c, move it over.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
io_uring/cancel.c | 6 ++++++
io_uring/io_uring.c | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/io_uring/cancel.c b/io_uring/cancel.c
index 2754ea80e288..3ba82a1bfe80 100644
--- a/io_uring/cancel.c
+++ b/io_uring/cancel.c
@@ -422,3 +422,9 @@ bool io_match_task_safe(struct io_kiocb *head, struct io_uring_task *tctx,
}
return matched;
}
+
+void __io_uring_cancel(bool cancel_all)
+{
+ io_uring_unreg_ringfd();
+ io_uring_cancel_generic(cancel_all, NULL);
+}
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 75bd049a1efd..b3be305b99be 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -3336,12 +3336,6 @@ __cold void io_uring_cancel_generic(bool cancel_all, struct io_sq_data *sqd)
}
}
-void __io_uring_cancel(bool cancel_all)
-{
- io_uring_unreg_ringfd();
- io_uring_cancel_generic(cancel_all, NULL);
-}
-
static struct io_uring_reg_wait *io_get_ext_arg_reg(struct io_ring_ctx *ctx,
const struct io_uring_getevents_arg __user *uarg)
{
--
2.51.0
prev parent reply other threads:[~2025-11-03 18:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-03 18:47 [PATCHSET 0/6] Various minor cleanups Jens Axboe
2025-11-03 18:47 ` [PATCH 1/6] io_uring/slist: remove unused wq list splice helpers Jens Axboe
2025-11-03 18:47 ` [PATCH 2/6] io_uring/rsrc: use get/put_user() for integer copy Jens Axboe
2025-11-03 18:48 ` [PATCH 3/6] io_uring/notif: move io_notif_flush() to net.c Jens Axboe
2025-11-04 13:05 ` Pavel Begunkov
2025-11-04 16:31 ` Jens Axboe
2025-11-05 13:14 ` Pavel Begunkov
2025-11-03 18:48 ` [PATCH 4/6] io_uring/memmap: remove dead io_create_region_mmap_safe() declaration Jens Axboe
2025-11-03 18:48 ` [PATCH 5/6] io_uring/cancel: move request/task cancelation logic into cancel.c Jens Axboe
2025-11-03 18:48 ` Jens Axboe [this message]
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=20251103184937.61634-7-axboe@kernel.dk \
--to=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.