---

yaml --- r: 27072 b: refs/heads/master c: e0de020 h: refs/heads/master v: v3
git-mirror · Jun 1, 2006 · 44617b2 · 44617b2
1 parent b75924c
commit 44617b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba8f5baba79da8eb502f8534c3a8ecb64aceb790
+refs/heads/master: e0de0206a2a37cd3e0ba9954d9f863e11d6d1782
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -878,6 +878,13 @@ static struct cfq_queue *cfq_set_active_queue(struct cfq_data *cfqd)
 	if (!list_empty(&cfqd->cur_rr) || cfq_get_next_prio_level(cfqd) != -1)
 		cfqq = list_entry_cfqq(cfqd->cur_rr.next);
 
+	/*
+	 * If no new queues are available, check if the busy list has some
+	 * before falling back to idle io.
+	 */
+	if (!cfqq && !list_empty(&cfqd->busy_rr))
+		cfqq = list_entry_cfqq(cfqd->busy_rr.next);
+
 	/*
 	 * if we have idle queues and no rt or be queues had pending
 	 * requests, either allow immediate service if the grace period