Skip to content

Commit

Permalink
io_uring: remove timeout/poll specific cancelations
Browse files Browse the repository at this point in the history
For historical reasons these were special cased, as they were the only
ones that needed cancelation. But now we handle cancelations generally,
and hence there's no need to check for these in
io_ring_ctx_wait_and_kill() when io_uring_try_cancel_requests() handles
both these and the rest as well.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Jens Axboe committed Apr 15, 2024
1 parent 2541762 commit 29f858a
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions io_uring/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -3068,17 +3068,8 @@ static __cold void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx)
percpu_ref_kill(&ctx->refs);
xa_for_each(&ctx->personalities, index, creds)
io_unregister_personality(ctx, index);
if (ctx->rings)
io_poll_remove_all(ctx, NULL, true);
mutex_unlock(&ctx->uring_lock);

/*
* If we failed setting up the ctx, we might not have any rings
* and therefore did not submit any requests
*/
if (ctx->rings)
io_kill_timeouts(ctx, NULL, true);

flush_delayed_work(&ctx->fallback_work);

INIT_WORK(&ctx->exit_work, io_ring_exit_work);
Expand Down

0 comments on commit 29f858a

Please sign in to comment.