---

yaml --- r: 176499 b: refs/heads/master c: 554554f h: refs/heads/master i: 176497: 545d429 176495: c09d1da v: v3
git-mirror · Dec 10, 2009 · 5113559 · 5113559
1 parent 7da1126
commit 5113559
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);