block: leave the request timeout timer running even on an empty list

[linux-2.6-block.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 561e8a1b43a4a526e405905c69cf8f0e15a4df27..243d18b4ceb0ba312c9d8427c00cd02a6c3ae88a 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -404,6 +404,7 @@ EXPORT_SYMBOL(blk_stop_queue);
 void blk_sync_queue(struct request_queue *q)
 {
        del_timer_sync(&q->unplug_timer);
+       del_timer_sync(&q->timeout);
        kblockd_flush_work(&q->unplug_work);
 }
 EXPORT_SYMBOL(blk_sync_queue);