---

yaml --- r: 143347 b: refs/heads/master c: 2d87072 h: refs/heads/master i: 143345: 8f5a279 143343: 0b2023a v: v3
git-mirror · Apr 15, 2009 · 080c2b0 · 080c2b0
1 parent 5a8b673
commit 080c2b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40bb54d197a10fe86d73073ee8202ba2812a05fa
+refs/heads/master: 2d870722965211de072bb36b446a4df99dae07e1
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -1905,10 +1905,13 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
 		 * of tiny requests, because we disrupt the normal plugging
 		 * and merging. If the request is already larger than a single
 		 * page, let it rip immediately. For that case we assume that
-		 * merging is already done.
+		 * merging is already done. Ditto for a busy system that
+		 * has other work pending, don't risk delaying until the
+		 * idle timer unplug to continue working.
 		 */
 		if (cfq_cfqq_wait_request(cfqq)) {
-			if (blk_rq_bytes(rq) > PAGE_CACHE_SIZE) {
+			if (blk_rq_bytes(rq) > PAGE_CACHE_SIZE ||
+			    cfqd->busy_queues > 1) {
 				del_timer(&cfqd->idle_slice_timer);
 				blk_start_queueing(cfqd->queue);
 			}