I suggest for 1/8 to go for current, and the rest are for next. Patches 2-8 finally unify how we do task and files cancellation removing boilerplate and making it easier to understand overall. As a bonus to it ->inflight_entry is now used only for iopoll, probably can be put into a union with something and save 16B of io_kiocb if that would be needed. Pavel Begunkov (8): io_uring: close a small race gap for files cancel io_uring: further deduplicate #CQ events calc io_uring: account per-task #requests with files io_uring: explicitly pass tctx into del_task_file io_uring: draft files cancel based on inflight cnt io_uring: remove old files cancel mechanism io_uring: cleanup task cancel io_uring: kill not used anymore inflight_lock fs/io_uring.c | 166 +++++++++++++-------------------------- include/linux/io_uring.h | 13 ++- 2 files changed, 59 insertions(+), 120 deletions(-) -- 2.24.0