From 21a29b7ec8b16d4227dccbf21e7f503273e10880 Mon Sep 17 00:00:00 2001
From: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
Date: Tue, 15 Dec 2009 10:08:45 +0100
Subject: [PATCH] --- yaml --- r: 176501 b: refs/heads/master c:
 66ae291978177d5c012015f12b8fbc76dc7d0965 h: refs/heads/master i:   176499:
 51135599df72257da2a1a47cbd44cb57b168d871 v: v3

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

diff --git a/[refs] b/[refs]
index 9d2dabcf744d..f897bb9c05db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82bbbf28db4beefcd8b897800153e21378270cd1
+refs/heads/master: 66ae291978177d5c012015f12b8fbc76dc7d0965
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index f3f62394b986..e2f80463ed0d 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -2113,7 +2113,9 @@ static void cfq_choose_cfqg(struct cfq_data *cfqd)
 		cfqd->workload_expires = jiffies + cfqg->saved_workload_slice;
 		cfqd->serving_type = cfqg->saved_workload;
 		cfqd->serving_prio = cfqg->saved_serving_prio;
-	}
+	} else
+		cfqd->workload_expires = jiffies - 1;
+
 	choose_service_tree(cfqd, cfqg);
 }