From c7651541e85b3dbd7b4192404def69a8f70fcac3 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 30 Nov 2009 09:38:13 +0100 Subject: [PATCH] --- yaml --- r: 172977 b: refs/heads/master c: 464191c65b85a8ec68a6e1a6293af625287c807e h: refs/heads/master i: 172975: a5c785b939c0372a4928a6d14b7d506e8c50d362 v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c2d667413024..d31c5147ec63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e550632cccae34e265cb066691945515eaa7fb5 +refs/heads/master: 464191c65b85a8ec68a6e1a6293af625287c807e diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index a5de31f76d3b..71446497d7b6 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/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)); } /*