mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 12:44:11 +08:00
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>
This commit is contained in:
parent
4010fec41f
commit
1575f21a09
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user