[PATCH] io-controller: Don't expire an idle ioq if it's the only ioq in hierarchy

Gui Jianfeng
2009-06-30T07:49:55Z

Hi Vivek,

We don't expect expiring an idle ioq if it's the only ioq
in the hierarchy.

Signed-off-by: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
---
block/elevator-fq.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/block/elevator-fq.c b/block/elevator-fq.c
index 4270cfd..0b65e16 100644
--- a/block/elevator-fq.c
+++ b/block/elevator-fq.c
@@ -4058,12 +4058,6 @@ void elv_ioq_completed_request(struct request_queue *q, struct request *rq)
elv_clear_ioq_slice_new(ioq);
}

- if (elv_ioq_class_idle(ioq)) {
- if (elv_iosched_expire_ioq(q, 1, 0))
- elv_ioq_slice_expired(q);
- goto done;
- }
-
/*
* If there is only root group present, don't expire the queue
* for single queue ioschedulers (noop, deadline, AS). It is
@@ -4077,6 +4071,12 @@ void elv_ioq_completed_request(struct request_queue *q, struct request *rq)
goto done;
}

+ if (elv_ioq_class_idle(ioq)) {
+ if (elv_iosched_expire_ioq(q, 1, 0))
+ elv_ioq_slice_expired(q);
+ goto done;
+ }
+
/* For async queue try to do wait busy */
if (efqd->fairness && !elv_ioq_sync(ioq) && !ioq->nr_queued
&& (elv_iog_nr_active(iog) <= 1)) {
--
1.5.4.rc3