From: Gui Jianfeng Date: Tue, 15 Dec 2009 09:08:45 +0000 (+0100) Subject: cfq: set workload as expired if it doesn't have any slice left X-Git-Tag: v2.6.33-rc1~76^2 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=66ae291978177d5c012015f12b8fbc76dc7d0965;p=net-next-2.6.git cfq: set workload as expired if it doesn't have any slice left When a group is resumed, if it doesn't have workload slice left, we should set workload_expires as expired. Otherwise, we might start from where we left in previous group by error. Thanks the idea from Corrado. Signed-off-by: Gui Jianfeng Signed-off-by: Jens Axboe --- diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index f3f62394b98..e2f80463ed0 100644 --- a/block/cfq-iosched.c +++ b/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); }