io_uring: remove opcode check on ltimeout kill
authorPavel Begunkov <asml.silence@gmail.com>
Thu, 22 Oct 2020 15:43:08 +0000 (16:43 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 23 Oct 2020 19:07:11 +0000 (13:07 -0600)
__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>
fs/io_uring.c

index d40717f8647b182e3ba02e07ce86c4814034b95a..db7ad9e611468ae047d650f6b25176361c634bf6 100644 (file)
@@ -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 [-> ...]