io_uring: don't cancel-track common timeouts
authorPavel Begunkov <asml.silence@gmail.com>
Thu, 25 Mar 2021 18:32:44 +0000 (18:32 +0000)
committerJens Axboe <axboe@kernel.dk>
Sat, 27 Mar 2021 20:09:11 +0000 (14:09 -0600)
Don't account usual timeouts (i.e. not linked) as REQ_F_INFLIGHT but
keep behaviour prior to dd59a3d595cc1 ("io_uring: reliably cancel linked
timeouts").

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/104441ef5d97e3932113d44501fda0df88656b83.1616696997.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 8498f74595f3d6392e4698bf2c1c79fb438a3971..87d198d223a20fd6e63e23b4bfdb4f13ddb7a53c 100644 (file)
@@ -5563,7 +5563,8 @@ static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,
 
        data->mode = io_translate_timeout_mode(flags);
        hrtimer_init(&data->timer, CLOCK_MONOTONIC, data->mode);
-       io_req_track_inflight(req);
+       if (is_timeout_link)
+               io_req_track_inflight(req);
        return 0;
 }