From 5406b427090205f6f24207637a55858b874bb241 Mon Sep 17 00:00:00 2001 From: Gui Jianfeng Date: Thu, 26 Nov 2009 09:14:11 +0100 Subject: [PATCH] --- yaml --- r: 172963 b: refs/heads/master c: 3586e917f2c7df769d173c4ec99554cb40a911e5 h: refs/heads/master i: 172961: a73d15e85ea5a2a95d2060d207262333087ecda3 172959: 6685012a2e720835cc9abcdc265f48fbac011785 v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aa898bfbab00..edb2b281ce98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32a87c0114f37871aefb12a30de3e0c3300e3646 +refs/heads/master: 3586e917f2c7df769d173c4ec99554cb40a911e5 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 1bcbd8c79896..467981e19d7a 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -600,11 +600,15 @@ 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 (cfqd->busy_queues - 1) * (cfq_prio_slice(cfqd, 1, 0) - - cfq_prio_slice(cfqd, cfq_cfqq_sync(cfqq), cfqq->ioprio)); + return service_tree->count * (cfq_prio_slice(cfqd, 1, 0) - + cfq_prio_slice(cfqd, cfq_cfqq_sync(cfqq), cfqq->ioprio)); } /*