Merge branch 'for-5.17/io_uring' into for-next

* for-5.17/io_uring:
  io_uring: use completion batching for poll rem/upd
  io_uring: single shot poll removal optimisation
  io_uring: poll rework
  io_uring: kill poll linking optimisation
  io_uring: move common poll bits
  io_uring: refactor poll update
  io_uring: remove double poll on poll update

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --cc fs/io_uring.c
index 66f65ce762df8c83f699c8bb7ed20264063bbf2c,eda8739592d04429e1f9dbb489b4d0819df9d973..90002bb3fdf4b12cb5b9b18abba398b6e2d42e6c
--- 1/fs/io_uring.c
--- 2/fs/io_uring.c
+++ b/fs/io_uring.c
@@@ -6164,8 -5766,10 +6132,10 @@@ static __cold bool io_poll_remove_all(s
  
                list = &ctx->cancel_hash[i];
                hlist_for_each_entry_safe(req, tmp, list, hash_node) {
-                       if (io_match_task_safe(req, tsk, cancel_all))
-                               posted += io_poll_remove_one(req);
 -                      if (io_match_task(req, tsk, cancel_all)) {
++                      if (io_match_task_safe(req, tsk, cancel_all)) {
+                               io_poll_cancel_req(req);
+                               found = true;
+                       }
                }
        }
        spin_unlock(&ctx->completion_lock);