---

yaml --- r: 172974 b: refs/heads/master c: e4a2291 h: refs/heads/master v: v3
git-mirror · Nov 26, 2009 · 2661e07 · 2661e07
1 parent 1f764c0
commit 2661e07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e459dd08f45d2aa68abb0c02f8ab045cf8a598b8
+refs/heads/master: e4a229196a7c676514c78f6783f8994f64bf681c
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -2392,8 +2392,9 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,
 	if (cfq_class_idle(cfqq))
 		return true;
 
-	if (cfqd->serving_type == SYNC_NOIDLE_WORKLOAD
-	    && new_cfqq->service_tree == cfqq->service_tree)
+	if (cfqd->serving_type == SYNC_NOIDLE_WORKLOAD &&
+	    cfqq_type(new_cfqq) == SYNC_NOIDLE_WORKLOAD &&
+	    new_cfqq->service_tree->count == 1)
 		return true;
 
 	/*