block: ensure that the timer is always added

Commit f793aa537866 relaxed the timer addition a little too much.
If the timer isn't pending, we always need to add it.

Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 43e8b515806f..95a09590ccfd 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -224,7 +224,7 @@ void blk_add_timer(struct request *req)
                  * modifying the timer because expires for value X
                  * will be X + something.
                  */
-                if (diff >= HZ / 2)
+                if (!timer_pending(&q->timeout) || (diff >= HZ / 2))
                         mod_timer(&q->timeout, expiry);
         }