io_uring: don't cancel extra on files match
authorPavel Begunkov <asml.silence@gmail.com>
Thu, 25 Mar 2021 18:32:45 +0000 (18:32 +0000)
committerJens Axboe <axboe@kernel.dk>
Sat, 27 Mar 2021 20:09:11 +0000 (14:09 -0600)
As tasks always wait and kill their io-wq on exec/exit, files are of no
more concern to us, so we don't need to specifically cancel them by hand
in those cases. Moreover we should not, because io_match_task() looks at
req->task->files now, which is always true and so leads to extra
cancellations, that wasn't a case before per-task io-wq.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/0566c1de9b9dd417f5de345c817ca953580e0e2e.1616696997.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 87d198d..880abd8 100644 (file)
@@ -1094,8 +1094,6 @@ static bool io_match_task(struct io_kiocb *head,
        io_for_each_link(req, head) {
                if (req->flags & REQ_F_INFLIGHT)
                        return true;
-               if (req->task->files == files)
-                       return true;
        }
        return false;
 }