---

yaml --- r: 242249 b: refs/heads/master c: a603271 h: refs/heads/master i: 242247: 61a8abe v: v3
git-mirror · Mar 7, 2011 · 6aeb5da · 6aeb5da
1 parent 4009142
commit 6aeb5da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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);
 }
 
 /*