block: ensure that the timer is always added

Commit f793aa5 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 <[email protected]>
josf · May 30, 2014 · c7bca41 · c7bca41
1 parent ee3c5db
commit c7bca41
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);
 	}