---

yaml --- r: 176495 b: refs/heads/master c: b9d8f4c h: refs/heads/master i: 176493: 5eabd7b 176491: 3c9a409 176487: 7b1176c 176479: 8757764 v: v3
git-mirror · Dec 9, 2009 · c09d1da · c09d1da
1 parent 80af9fa
commit c09d1da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3b8d92d25212c5b6534ae9b347ed2858de78336
+refs/heads/master: b9d8f4c73b1af4cfd53f819bf84c2bce31232275
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -1749,6 +1749,12 @@ static struct cfq_queue *cfq_close_cooperator(struct cfq_data *cfqd,
 	if (CFQQ_SEEKY(cur_cfqq))
 		return NULL;
 
+	/*
+	 * Don't search priority tree if it's the only queue in the group.
+	 */
+	if (cur_cfqq->cfqg->nr_cfqq == 1)
+		return NULL;
+
 	/*
 	 * We should notice if some of the queues are cooperating, eg
 	 * working closely on the same area of the disk. In that case,