6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jens Axboe [ Upstream commit 01e019b2a30df41c485f602a5246124ea911071b ] Yet another function that should be in cancel.c, move it over. Signed-off-by: Jens Axboe Stable-dep-of: fddcf4c5321b ("io_uring/cancel: don't spin on local work the task can't run") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- io_uring/cancel.c | 6 ++++++ io_uring/io_uring.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) --- a/io_uring/cancel.c +++ b/io_uring/cancel.c @@ -422,3 +422,9 @@ bool io_match_task_safe(struct io_kiocb } return matched; } + +void __io_uring_cancel(bool cancel_all) +{ + io_uring_unreg_ringfd(); + io_uring_cancel_generic(cancel_all, NULL); +} --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -3369,12 +3369,6 @@ end_wait: } } -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) {