include/linux/mmdebug.h: add VM_WARN_ON() and VM_WARN_ON_ONCE()

[deliverable/linux.git] / block / blk-timeout.c

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 43e8b515806f2c7dbe51c7c191d679abb62b77bc..95a09590ccfda8366f92efbee7c31f1654c11637 100644 (file)
--- 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);
        }