From da949a1eb772aa8114a5b0e3424d74a3f1d0f8b0 Mon Sep 17 00:00:00 2001
From: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
Date: Fri, 17 Dec 2010 08:57:14 +0100
Subject: [PATCH] --- yaml --- r: 230597 b: refs/heads/master c:
 7278c9c19bd85cf33213a2e0b538a18d3ac8ad00 h: refs/heads/master i:   230595:
 406aef56e3cd3857382b612e647d32c5cfca9fee v: v3

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

diff --git a/[refs] b/[refs]
index 9125b8970e3e..6be7e91d7f36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8adbe378b56acd5945df70753c7e8f6fe223304
+refs/heads/master: 7278c9c19bd85cf33213a2e0b538a18d3ac8ad00
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 9b186fd6bf47..c19d015ac5a5 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -2103,12 +2103,6 @@ static void choose_service_tree(struct cfq_data *cfqd, struct cfq_group *cfqg)
 	unsigned group_slice;
 	enum wl_prio_t original_prio = cfqd->serving_prio;
 
-	if (!cfqg) {
-		cfqd->serving_prio = IDLE_WORKLOAD;
-		cfqd->workload_expires = jiffies + 1;
-		return;
-	}
-
 	/* Choose next priority. RT > BE > IDLE */
 	if (cfq_group_busy_queues_wl(RT_WORKLOAD, cfqd, cfqg))
 		cfqd->serving_prio = RT_WORKLOAD;