From: Pavel Begunkov <asml.silence@gmail.com>
Date: Thu, 22 Oct 2020 15:43:08 +0000 (+0100)
Subject: io_uring: remove opcode check on ltimeout kill
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e08102d507f34e6591de521a4c2587c6f02c7996;p=linux.git

io_uring: remove opcode check on ltimeout kill

__io_kill_linked_timeout() already checks for REQ_F_LTIMEOUT_ACTIVE and
it's set only for linked timeouts. No need to verify next request's
opcode.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index d40717f8647b1..db7ad9e611468 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1872,8 +1872,7 @@ static bool __io_kill_linked_timeout(struct io_kiocb *req)
 	if (list_empty(&req->link_list))
 		return false;
 	link = list_first_entry(&req->link_list, struct io_kiocb, link_list);
-	if (link->opcode != IORING_OP_LINK_TIMEOUT)
-		return false;
+
 	/*
 	 * Can happen if a linked timeout fired and link had been like
 	 * req -> link t-out -> link t-out [-> ...]