X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=block%2Fcfq-iosched.c;h=71446497d7b6ee544058189559f967cac3556166;hb=464191c65b85a8ec68a6e1a6293af625287c807e;hp=a5de31f76d3bdf57e939071a49e8990a052c4cec;hpb=8e550632cccae34e265cb066691945515eaa7fb5;p=net-next-2.6.git

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));
 }
 
 /*