From 51135599df72257da2a1a47cbd44cb57b168d871 Mon Sep 17 00:00:00 2001
From: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
Date: Thu, 10 Dec 2009 09:38:39 +0100
Subject: [PATCH] --- yaml --- r: 176499 b: refs/heads/master c:
 554554f60ad619e1efab01897208bc320b81d9da h: refs/heads/master i:   176497:
 545d4299ecbd7c19bfb2c507ba5f40703cd75464   176495:
 c09d1da3262ef78dc0f53ad8ff7d26a90ac962a8 v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7627284c5838..a70d6aaf346e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edc71131c4dc6cc73e2a24aa0a7a79cfce738f12
+refs/heads/master: 554554f60ad619e1efab01897208bc320b81d9da
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 69ecee7f4ad4..96f59ae5b6e9 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -3202,6 +3202,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
 			if (blk_rq_bytes(rq) > PAGE_CACHE_SIZE ||
 			    cfqd->busy_queues > 1) {
 				del_timer(&cfqd->idle_slice_timer);
+				cfq_clear_cfqq_wait_request(cfqq);
 				__blk_run_queue(cfqd->queue);
 			} else
 				cfq_mark_cfqq_must_dispatch(cfqq);