From 6419d31bbc27ca8a96a2920982bcc8c7b7fc39b3 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Tue, 9 Nov 2010 14:51:13 +0100
Subject: [PATCH] --- yaml --- r: 230579 b: refs/heads/master c:
 2b9408a45978dcda77407859148deeccf403c372 h: refs/heads/master i:   230577:
 a090cb42027a5ce09c157e41f0c571ef227b78ab   230575:
 f3d99ba6a819095c09af7e1b281863261bf56b4f v: v3

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

diff --git a/[refs] b/[refs]
index 0f57ad144902..863afedfdd91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e1ac6655104bc6e1e79d67e2df88cc8fa9b6e07
+refs/heads/master: 2b9408a45978dcda77407859148deeccf403c372
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index ca4d19907243..f90519430be6 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -3523,25 +3523,8 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)
 		}
 	}
 
-	if (!cfqd->rq_in_driver) {
+	if (!cfqd->rq_in_driver)
 		cfq_schedule_dispatch(cfqd);
-		return;
-	}
-	/*
-	 * A queue is idle at cfq_dispatch_requests(), but it gets noidle
-	 * later. We schedule a dispatch if the queue has no requests,
-	 * otherwise the disk is actually in idle till all requests
-	 * are finished even cfq_arm_slice_timer doesn't make the queue idle
-	 * */
-	cfqq = cfqd->active_queue;
-	if (!cfqq)
-		return;
-
-	if (RB_EMPTY_ROOT(&cfqq->sort_list) && !cfq_should_idle(cfqd, cfqq) &&
-	    (!cfqd->cfq_group_idle || cfqq->cfqg->nr_cfqq > 1)) {
-		cfq_del_timer(cfqd, cfqq);
-		cfq_schedule_dispatch(cfqd);
-	}
 }
 
 /*