From: Pavel Begunkov Date: Mon, 22 Mar 2021 01:58:24 +0000 (+0000) Subject: io_uring: don't clear REQ_F_LINK_TIMEOUT X-Git-Tag: for-5.13/io_uring-2021-04-27~121 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d4729fbde7665e81f4345e04e2ca86c0b52994d3;p=linux-2.6-block.git io_uring: don't clear REQ_F_LINK_TIMEOUT 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 Signed-off-by: Jens Axboe --- diff --git a/fs/io_uring.c b/fs/io_uring.c index 7a6b2b313328..a152c0fd24cc 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -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)