diff options
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r-- | block/cfq-iosched.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index a5de31f76d3b..71446497d7b6 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -609,15 +609,11 @@ cfq_find_next_rq(struct cfq_data *cfqd, struct cfq_queue *cfqq, | |||
609 | static unsigned long cfq_slice_offset(struct cfq_data *cfqd, | 609 | static unsigned long cfq_slice_offset(struct cfq_data *cfqd, |
610 | struct cfq_queue *cfqq) | 610 | struct cfq_queue *cfqq) |
611 | { | 611 | { |
612 | struct cfq_rb_root *service_tree; | ||
613 | |||
614 | service_tree = service_tree_for(cfqq_prio(cfqq), cfqq_type(cfqq), cfqd); | ||
615 | |||
616 | /* | 612 | /* |
617 | * just an approximation, should be ok. | 613 | * just an approximation, should be ok. |
618 | */ | 614 | */ |
619 | return service_tree->count * (cfq_prio_slice(cfqd, 1, 0) - | 615 | return (cfqd->busy_queues - 1) * (cfq_prio_slice(cfqd, 1, 0) - |
620 | cfq_prio_slice(cfqd, cfq_cfqq_sync(cfqq), cfqq->ioprio)); | 616 | cfq_prio_slice(cfqd, cfq_cfqq_sync(cfqq), cfqq->ioprio)); |
621 | } | 617 | } |
622 | 618 | ||
623 | /* | 619 | /* |