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 <axboe@kernel.dk>

diff --git a/io_uring/poll.c b/io_uring/poll.c
index c7bb292c9046ed37ddc3a4c2310167ad4970ae50..dc1219f606e527105313c98c20913bb928452144 100644 (file)
--- 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);
        }

diff --git a/io_uring/timeout.c b/io_uring/timeout.c
index 4200099ad96efeee4734ed7b6f8dab87780dd999..6242130e73c659b59fbbfac72c39d0a37bcad7ec 100644 (file)
--- a/io_uring/timeout.c
+++ b/io_uring/timeout.c
@@ -268,16 +268,10 @@ static struct io_kiocb *io_timeout_extract(struct io_ring_ctx *ctx,
        list_for_each_entry(timeout, &ctx->timeout_list, list) {
                struct io_kiocb *tmp = cmd_to_io_kiocb(timeout);
 
-               if (!(cd->flags & IORING_ASYNC_CANCEL_ANY) &&
-                   cd->data != tmp->cqe.user_data)
-                       continue;
-               if (cd->flags & (IORING_ASYNC_CANCEL_ALL|IORING_ASYNC_CANCEL_ANY)) {
-                       if (cd->seq == tmp->work.cancel_seq)
-                               continue;
-                       tmp->work.cancel_seq = cd->seq;
+               if (io_cancel_req_match(tmp, cd)) {
+                       req = tmp;
+                       break;
                }
-               req = tmp;
-               break;
        }
        if (!req)
                return ERR_PTR(-ENOENT);