From 6aeb5dae094c4c28902166dba7ee3de71e072769 Mon Sep 17 00:00:00 2001 From: Gui Jianfeng Date: Mon, 7 Mar 2011 09:28:09 +0100 Subject: [PATCH] --- yaml --- r: 242249 b: refs/heads/master c: a60327107b56573c305ecc78e471dbdbb4d2f426 h: refs/heads/master i: 242247: 61a8abe42a0af21ea6873956ba36e94d234c62ac v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7d61137eb0de..493fdaacea15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef8a41df8c140f10108de75b01b6369d6e49113c +refs/heads/master: a60327107b56573c305ecc78e471dbdbb4d2f426 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 135b1a48da23..938ae52aa927 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -557,15 +557,13 @@ static inline u64 min_vdisktime(u64 min_vdisktime, u64 vdisktime) static void update_min_vdisktime(struct cfq_rb_root *st) { - u64 vdisktime = st->min_vdisktime; struct cfq_group *cfqg; if (st->left) { cfqg = rb_entry_cfqg(st->left); - vdisktime = min_vdisktime(vdisktime, cfqg->vdisktime); + st->min_vdisktime = max_vdisktime(st->min_vdisktime, + cfqg->vdisktime); } - - st->min_vdisktime = max_vdisktime(st->min_vdisktime, vdisktime); } /*