From 4c402ed327abfa47293b5ab531e426e1336c4d8e Mon Sep 17 00:00:00 2001
From: Corrado Zoccolo <czoccolo@gmail.com>
Date: Thu, 26 Nov 2009 09:41:21 +0100
Subject: [PATCH] --- yaml --- r: 172965 b: refs/heads/master c:
 c16632bab1a17e357cec66920ceb3f0630009360 h: refs/heads/master i:   172963:
 5406b427090205f6f24207637a55858b874bb241 v: v3

---
 [refs]                    |  2 +-
 trunk/block/cfq-iosched.c | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 71b1865e19e0..4dee1d59c866 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d4dc890b5c8fabd818a8586607e6843c4375e62
+refs/heads/master: c16632bab1a17e357cec66920ceb3f0630009360
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 467981e19d7a..c2ef5d17608c 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -1269,19 +1269,6 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd)
 	cfq_mark_cfqq_wait_request(cfqq);
 
 	sl = cfqd->cfq_slice_idle;
-	/* are we servicing noidle tree, and there are more queues?
-	 * non-rotational or NCQ: no idle
-	 * non-NCQ rotational : very small idle, to allow
-	 *     fair distribution of slice time for a process doing back-to-back
-	 *     seeks.
-	 */
-	if (cfqd->serving_type == SYNC_NOIDLE_WORKLOAD &&
-	    service_tree_for(cfqd->serving_prio, SYNC_NOIDLE_WORKLOAD, cfqd)
-		->count > 0) {
-		if (blk_queue_nonrot(cfqd->queue) || cfqd->hw_tag)
-			return;
-		sl = min(sl, msecs_to_jiffies(CFQ_MIN_TT));
-	}
 
 	mod_timer(&cfqd->idle_slice_timer, jiffies + sl);
 	cfq_log_cfqq(cfqd, cfqq, "arm_idle: %lu", sl);