From 7c29349a27b577c1f110dea51744d2028a6d4fc5 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Mon, 20 Oct 2008 15:44:28 +0200
Subject: [PATCH] --- yaml --- r: 123300 b: refs/heads/master c:
 30e0dc28bff9dc456cdfc2aae4aca78b8b1a1cec h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 91ae9a0882c0..4664d97e4401 100644
--- 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
index adaf93a9d19d..ee8a90c7c46c 100644
--- 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;