diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2020-12-20 13:21:43 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-12-20 11:05:39 -0700 |
| commit | 55583d72e2303638d30dd4a7aabef59ffa0a017a (patch) | |
| tree | f435b2d324235ad2d08aa9dbdacde0a53d7724b2 /fs | |
| parent | 446bc1c207331080d8c711a4456799b7d0b9df26 (diff) | |
| download | linux-55583d72e2303638d30dd4a7aabef59ffa0a017a.tar.bz2 | |
io_uring: always progress task_work on task cancel
Might happen that __io_uring_cancel_task_requests() cancels nothing but
there are task_works pending. We need to always run them.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 48b9332c2354..d0ab6b503a9f 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -8801,9 +8801,9 @@ static void __io_uring_cancel_task_requests(struct io_ring_ctx *ctx, ret |= io_poll_remove_all(ctx, task, NULL); ret |= io_kill_timeouts(ctx, task, NULL); + ret |= io_run_task_work(); if (!ret) break; - io_run_task_work(); cond_resched(); } } |