From a30badf66de8516b5a5bca7a5d339f377ff983ea Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 23 Jun 2023 09:04:35 -0600 Subject: io_uring: use cancelation match helper for poll and timeout requests Get rid of the request vs io_cancel_data checking and just use the exported helper for this. Signed-off-by: Jens Axboe --- io_uring/poll.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'io_uring/poll.c') diff --git a/io_uring/poll.c b/io_uring/poll.c index c7bb292c9046..dc1219f606e5 100644 --- a/io_uring/poll.c +++ b/io_uring/poll.c @@ -824,14 +824,10 @@ static struct io_kiocb *io_poll_file_find(struct io_ring_ctx *ctx, spin_lock(&hb->lock); hlist_for_each_entry(req, &hb->list, hash_node) { - if (!(cd->flags & IORING_ASYNC_CANCEL_ANY) && - req->file != cd->file) - continue; - if (cd->seq == req->work.cancel_seq) - continue; - req->work.cancel_seq = cd->seq; - *out_bucket = hb; - return req; + if (io_cancel_req_match(req, cd)) { + *out_bucket = hb; + return req; + } } spin_unlock(&hb->lock); } -- cgit v1.2.3