aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
Diffstat (limited to 'block')
-rw-r--r--block/blk-timeout.c2
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)
224 * modifying the timer because expires for value X 224 * modifying the timer because expires for value X
225 * will be X + something. 225 * will be X + something.
226 */ 226 */
227 if (diff >= HZ / 2) 227 if (!timer_pending(&q->timeout) || (diff >= HZ / 2))
228 mod_timer(&q->timeout, expiry); 228 mod_timer(&q->timeout, expiry);
229 } 229 }
230 230