summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-11-30 09:38:13 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-11-30 09:38:13 +0100
commit464191c65b85a8ec68a6e1a6293af625287c807e (patch)
tree4d4b91a3a4ce2faeb63758b119f0fb229fcc57ea /block
parent8e550632cccae34e265cb066691945515eaa7fb5 (diff)
downloadlinux-3.10-464191c65b85a8ec68a6e1a6293af625287c807e.tar.gz
linux-3.10-464191c65b85a8ec68a6e1a6293af625287c807e.tar.bz2
linux-3.10-464191c65b85a8ec68a6e1a6293af625287c807e.zip
Revert "cfq: Make use of service count to estimate the rb_key offset"
This reverts commit 3586e917f2c7df769d173c4ec99554cb40a911e5. Corrado Zoccolo <czoccolo@gmail.com> correctly points out, that we need consistency of rb_key offset across groups. This means we cannot properly use the per-service_tree service count. Revert this change. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index a5de31f76d3..71446497d7b 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,
static unsigned long cfq_slice_offset(struct cfq_data *cfqd,
struct cfq_queue *cfqq)
{
- struct cfq_rb_root *service_tree;
-
- service_tree = service_tree_for(cfqq_prio(cfqq), cfqq_type(cfqq), cfqd);
-
/*
* just an approximation, should be ok.
*/
- return service_tree->count * (cfq_prio_slice(cfqd, 1, 0) -
- cfq_prio_slice(cfqd, cfq_cfqq_sync(cfqq), cfqq->ioprio));
+ return (cfqd->busy_queues - 1) * (cfq_prio_slice(cfqd, 1, 0) -
+ cfq_prio_slice(cfqd, cfq_cfqq_sync(cfqq), cfqq->ioprio));
}
/*