diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2020-10-22 16:43:08 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2020-10-23 13:07:11 -0600 |
| commit | e08102d507f34e6591de521a4c2587c6f02c7996 (patch) | |
| tree | 422e446c4946e048bb8104e3a591631a372da8bb /fs/io_uring.c | |
| parent | splice: change exported internal do_splice() helper to take kernel offset (diff) | |
| download | linux-dev-e08102d507f34e6591de521a4c2587c6f02c7996.tar.xz linux-dev-e08102d507f34e6591de521a4c2587c6f02c7996.zip | |
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>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index d40717f8647b..db7ad9e61146 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 [-> ...] |