aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/blk-core.c1
-rw-r--r--block/blk-timeout.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 561e8a1b43a..243d18b4ceb 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -404,6 +404,7 @@ EXPORT_SYMBOL(blk_stop_queue);
404void blk_sync_queue(struct request_queue *q) 404void blk_sync_queue(struct request_queue *q)
405{ 405{
406 del_timer_sync(&q->unplug_timer); 406 del_timer_sync(&q->unplug_timer);
407 del_timer_sync(&q->timeout);
407 kblockd_flush_work(&q->unplug_work); 408 kblockd_flush_work(&q->unplug_work);
408} 409}
409EXPORT_SYMBOL(blk_sync_queue); 410EXPORT_SYMBOL(blk_sync_queue);
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 99c3efc706b..a09535377a9 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -73,11 +73,7 @@ ssize_t part_timeout_store(struct device *dev, struct device_attribute *attr,
73 */ 73 */
74void blk_delete_timer(struct request *req) 74void blk_delete_timer(struct request *req)
75{ 75{
76 struct request_queue *q = req->q;
77
78 list_del_init(&req->timeout_list); 76 list_del_init(&req->timeout_list);
79 if (list_empty(&q->timeout_list))
80 del_timer(&q->timeout);
81} 77}
82 78
83static void blk_rq_timed_out(struct request *req) 79static void blk_rq_timed_out(struct request *req)