---

yaml --- r: 172931 b: refs/heads/master c: 125c4f2 h: refs/heads/master i: 172929: 18a187e 172927: 9836968 v: v3
git-mirror · Nov 3, 2009 · 7503bd5 · 7503bd5
1 parent 967b2cb
commit 7503bd5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2058297d2d045cb57138c33b87cfabcc80e65186
+refs/heads/master: 125c4f221a5352ae08aef2898055b879ad963f01
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -2433,7 +2433,6 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,
 	 * if this request is as-good as one we would expect from the
 	 * current cfqq, let it preempt
 	 */
-	if (cfq_rq_close(cfqd, cfqq, rq))
 	if (cfq_rq_close(cfqd, cfqq, rq) && (!cfq_cfqq_coop(new_cfqq) ||
 	    cfqd->busy_queues == 1)) {
 		/*