---

yaml --- r: 123274 b: refs/heads/master c: 70ed28b h: refs/heads/master v: v3
git-mirror · Dec 29, 2008 · 588bc66 · 588bc66
1 parent 85e7d8a
commit 588bc66
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65d3618ccfe686e8d7b3f01a838d0578182406df
+refs/heads/master: 70ed28b92a786f44750ab64117b03d126dd14656
diff --git a/trunk/block/blk-core.c b/trunk/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);

diff --git a/trunk/block/blk-timeout.c b/trunk/block/blk-timeout.c
@@ -73,11 +73,7 @@ ssize_t part_timeout_store(struct device *dev, struct device_attribute *attr,
  */
 void blk_delete_timer(struct request *req)
 {
-	struct request_queue *q = req->q;
-
 	list_del_init(&req->timeout_list);
-	if (list_empty(&q->timeout_list))
-		del_timer(&q->timeout);
 }
 
 static void blk_rq_timed_out(struct request *req)