diff options
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r-- | block/cfq-iosched.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 135b1a48da23..938ae52aa927 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -557,15 +557,13 @@ static inline u64 min_vdisktime(u64 min_vdisktime, u64 vdisktime) | |||
557 | 557 | ||
558 | static void update_min_vdisktime(struct cfq_rb_root *st) | 558 | static void update_min_vdisktime(struct cfq_rb_root *st) |
559 | { | 559 | { |
560 | u64 vdisktime = st->min_vdisktime; | ||
561 | struct cfq_group *cfqg; | 560 | struct cfq_group *cfqg; |
562 | 561 | ||
563 | if (st->left) { | 562 | if (st->left) { |
564 | cfqg = rb_entry_cfqg(st->left); | 563 | cfqg = rb_entry_cfqg(st->left); |
565 | vdisktime = min_vdisktime(vdisktime, cfqg->vdisktime); | 564 | st->min_vdisktime = max_vdisktime(st->min_vdisktime, |
565 | cfqg->vdisktime); | ||
566 | } | 566 | } |
567 | |||
568 | st->min_vdisktime = max_vdisktime(st->min_vdisktime, vdisktime); | ||
569 | } | 567 | } |
570 | 568 | ||
571 | /* | 569 | /* |