From 42a7f02edd16909e0c7c07b2af16138591abcabd Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@redhat.com>
Date: Fri, 10 Jul 2009 10:20:30 +0200
Subject: [PATCH] --- yaml --- r: 161203 b: refs/heads/master c:
 d58b85e1e891cd842d6e183f5d94d06a4fd0122c h: refs/heads/master i:   161201:
 2854b9ba3ca898b8ff5dfa73058622e0dc7849c9   161199:
 91a6240e684af939cf15fd10c901a112acf3e29c v: v3

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

diff --git a/[refs] b/[refs]
index d9b8bb747833..a5db910e33f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ad531db6e0f3c3c985666e83d3c1c4d53acccf9
+refs/heads/master: d58b85e1e891cd842d6e183f5d94d06a4fd0122c
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 93693bf6083e..ca0d7e71324b 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -134,11 +134,6 @@ struct cfq_data {
 	struct rb_root prio_trees[CFQ_PRIO_LISTS];
 
 	unsigned int busy_queues;
-	/*
-	 * Used to track any pending rt requests so we can pre-empt current
-	 * non-RT cfqq in service when this value is non-zero.
-	 */
-	unsigned int busy_rt_queues;
 
 	int rq_in_driver[2];
 	int sync_flight;
@@ -653,8 +648,6 @@ static void cfq_add_cfqq_rr(struct cfq_data *cfqd, struct cfq_queue *cfqq)
 	BUG_ON(cfq_cfqq_on_rr(cfqq));
 	cfq_mark_cfqq_on_rr(cfqq);
 	cfqd->busy_queues++;
-	if (cfq_class_rt(cfqq))
-		cfqd->busy_rt_queues++;
 
 	cfq_resort_rr_list(cfqd, cfqq);
 }
@@ -678,8 +671,6 @@ static void cfq_del_cfqq_rr(struct cfq_data *cfqd, struct cfq_queue *cfqq)
 
 	BUG_ON(!cfqd->busy_queues);
 	cfqd->busy_queues--;
-	if (cfq_class_rt(cfqq))
-		cfqd->busy_rt_queues--;
 }
 
 /*
@@ -1184,20 +1175,6 @@ static struct cfq_queue *cfq_select_queue(struct cfq_data *cfqd)
 	if (cfq_slice_used(cfqq) && !cfq_cfqq_must_dispatch(cfqq))
 		goto expire;
 
-	/*
-	 * If we have a RT cfqq waiting, then we pre-empt the current non-rt
-	 * cfqq.
-	 */
-	if (!cfq_class_rt(cfqq) && cfqd->busy_rt_queues) {
-		/*
-		 * We simulate this as cfqq timed out so that it gets to bank
-		 * the remaining of its time slice.
-		 */
-		cfq_log_cfqq(cfqd, cfqq, "preempt");
-		cfq_slice_expired(cfqd, 1);
-		goto new_queue;
-	}
-
 	/*
 	 * The active queue has requests and isn't expired, allow it to
 	 * dispatch.