1/2 is a prep, 2/2 fixes the issue. Many io_run_task_work_head() call sites look nasty, but I expect them all but one to go away after controlling SQPOLL task lifetime. Pavel Begunkov (2): io_uring: add generic callback_head helpers io_uring: fix sqpoll cancellation via task_work fs/io_uring.c | 68 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 27 deletions(-) -- 2.24.0