diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-02-28 01:20:49 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-03-04 16:36:26 +0300 |
| commit | 1575f21a09206e914b81dace0add693346d97594 (patch) | |
| tree | 81ffd172f343c2cb9f2f1bd154312fd803ec68e8 /fs | |
| parent | 4010fec41fd9fc5ca6956b958d14b32e41aded48 (diff) | |
| download | linux-1575f21a09206e914b81dace0add693346d97594.tar.xz | |
io_uring: kill unnecessary REQ_F_WORK_INITIALIZED checks
We're no longer checking anything that requires the work item to be
initialized, as we're not carrying any file related state there.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index acbf3c7264b5..1dd30a15ea6a 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1080,8 +1080,6 @@ static bool io_match_task(struct io_kiocb *head, return true; io_for_each_link(req, head) { - if (!(req->flags & REQ_F_WORK_INITIALIZED)) - continue; if (req->file && req->file->f_op == &io_uring_fops) return true; if (req->task->files == files) @@ -1800,15 +1798,7 @@ static void io_fail_links(struct io_kiocb *req) trace_io_uring_fail_link(req, link); io_cqring_fill_event(link, -ECANCELED); - /* - * It's ok to free under spinlock as they're not linked anymore, - * but avoid REQ_F_WORK_INITIALIZED because it may deadlock on - * work.fs->lock. - */ - if (link->flags & REQ_F_WORK_INITIALIZED) - io_put_req_deferred(link, 2); - else - io_double_put_req(link); + io_put_req_deferred(link, 2); link = nxt; } io_commit_cqring(ctx); |