---

yaml --- r: 123300 b: refs/heads/master c: 30e0dc2 h: refs/heads/master v: v3
git-mirror · Dec 29, 2008 · 7c29349 · 7c29349
1 parent 7148b02
commit 7c29349
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31dcfab0ae6eb0340d456931df4d478e17efc65d
+refs/heads/master: 30e0dc28bff9dc456cdfc2aae4aca78b8b1a1cec
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -1136,12 +1136,8 @@ static int cfq_dispatch_requests(struct request_queue *q, int force)
 		if (cfq_class_idle(cfqq))
 			max_dispatch = 1;
 
-		if (cfqq->dispatched >= max_dispatch) {
-			if (cfqd->busy_queues > 1)
-				break;
-			if (cfqq->dispatched >= 4 * max_dispatch)
-				break;
-		}
+		if (cfqq->dispatched >= max_dispatch && cfqd->busy_queues > 1)
+			break;
 
 		if (cfqd->sync_flight && !cfq_cfqq_sync(cfqq))
 			break;