Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756476AbZF3Htz (ORCPT ); Tue, 30 Jun 2009 03:49:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751718AbZF3Htr (ORCPT ); Tue, 30 Jun 2009 03:49:47 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:53699 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751488AbZF3Htq (ORCPT ); Tue, 30 Jun 2009 03:49:46 -0400 Message-ID: <4A49C381.3040302@cn.fujitsu.com> Date: Tue, 30 Jun 2009 15:49:21 +0800 From: Gui Jianfeng User-Agent: Thunderbird 2.0.0.5 (Windows/20070716) MIME-Version: 1.0 To: Vivek Goyal CC: linux-kernel@vger.kernel.org, containers@lists.linux-foundation.org, dm-devel@redhat.com, jens.axboe@oracle.com, nauman@google.com, dpshah@google.com, lizf@cn.fujitsu.com, mikew@google.com, fchecconi@gmail.com, paolo.valente@unimore.it, ryov@valinux.co.jp, fernando@oss.ntt.co.jp, s-uchida@ap.jp.nec.com, taka@valinux.co.jp, jmoyer@redhat.com, dhaval@linux.vnet.ibm.com, balbir@linux.vnet.ibm.com, righi.andrea@gmail.com, m-ikeda@ds.jp.nec.com, jbaron@redhat.com, agk@redhat.com, snitzer@redhat.com, akpm@linux-foundation.org, peterz@infradead.org Subject: [PATCH] io-controller: Don't expire an idle ioq if it's the only ioq in hierarchy References: <1245443858-8487-1-git-send-email-vgoyal@redhat.com> <1245443858-8487-9-git-send-email-vgoyal@redhat.com> In-Reply-To: <1245443858-8487-9-git-send-email-vgoyal@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1444 Lines: 49 Hi Vivek, We don't expect expiring an idle ioq if it's the only ioq in the hierarchy. Signed-off-by: Gui Jianfeng --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/