redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
master
Jens Axboe 2021-02-27 15:20:49 -07:00
parent 4010fec41f
commit 1575f21a09
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/io_uring.c
View File

@ -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);