summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2021-03-25 18:32:45 +0000
committerJens Axboe <axboe@kernel.dk>2021-03-27 14:09:11 -0600
commit78d9d7c2a331fb7a68a86e53ef7e12966459e0c5 (patch)
treeb9388f82fee20669d128872bd229f5dabd4ee5d2
parent2482b58ffbdc80cfaae969ad19cb32803056505b (diff)
downloadlwn-78d9d7c2a331fb7a68a86e53ef7e12966459e0c5.tar.gz
lwn-78d9d7c2a331fb7a68a86e53ef7e12966459e0c5.zip
io_uring: don't cancel extra on files match
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>
-rw-r--r--fs/io_uring.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 87d198d223a2..880abd8b6d31 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -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;
}