Blaster4385/linux-IllusionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

io_uring: don't clear REQ_F_LINK_TIMEOUT

Browse source 
REQ_F_LINK_TIMEOUT is a hint that to look for linked timeouts to cancel,
we're leaving it even when it's already fired. Hence don't care to clear
it in io_kill_linked_timeout(), it's safe and is called only once.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2021-03-22 01:58:24 +00:00 committed by Jens Axboe
parent c15b79dee5
commit d4729fbde7
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/io_uring.c
View file

@ -1766,7 +1766,6 @@ static bool io_kill_linked_timeout(struct io_kiocb *req)
__must_hold(&req->ctx->completion_lock)
{
struct io_kiocb *link = req->link;
bool cancelled = false;
/*
* Can happen if a linked timeout fired and link had been like
@ -1782,11 +1781,10 @@ static bool io_kill_linked_timeout(struct io_kiocb *req)
if (ret != -1) {
io_cqring_fill_event(link, -ECANCELED);
io_put_req_deferred(link, 1);
cancelled = true;
return true;
}
}
req->flags &= ~REQ_F_LINK_TIMEOUT;
return cancelled;
return false;
}
static void io_fail_links(struct io_kiocb *req)