From patchwork Fri Jun 5 09:36:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gui Jianfeng X-Patchwork-Id: 28159 Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n559bu7i032545 for ; Fri, 5 Jun 2009 09:37:57 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 20E6F61A7D8; Fri, 5 Jun 2009 05:37:56 -0400 (EDT) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n559brwU008225 for ; Fri, 5 Jun 2009 05:37:54 -0400 Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n559bqMQ001052; Fri, 5 Jun 2009 05:37:52 -0400 Received: from song.cn.fujitsu.com (cn.fujitsu.com [222.73.24.84] (may be forged)) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n559bcAb032247; Fri, 5 Jun 2009 05:37:39 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id D2A1B170147; Fri, 5 Jun 2009 17:56:41 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id n559l5No026505; Fri, 5 Jun 2009 17:47:05 +0800 Received: from [127.0.0.1] (unknown [10.167.141.226]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 6D066290D1B; Fri, 5 Jun 2009 17:37:06 +0800 (CST) Message-ID: <4A28E710.5080307@cn.fujitsu.com> Date: Fri, 05 Jun 2009 17:36:16 +0800 From: Gui Jianfeng User-Agent: Thunderbird 2.0.0.5 (Windows/20070716) MIME-Version: 1.0 To: Vivek Goyal References: <1243377729-2176-1-git-send-email-vgoyal@redhat.com> <1243377729-2176-6-git-send-email-vgoyal@redhat.com> In-Reply-To: <1243377729-2176-6-git-send-email-vgoyal@redhat.com> X-RedHat-Spam-Score: -0.71 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-Scanned-By: MIMEDefang 2.63 on 172.16.48.31 X-loop: dm-devel@redhat.com Cc: dhaval@linux.vnet.ibm.com, snitzer@redhat.com, peterz@infradead.org, dm-devel@redhat.com, dpshah@google.com, jens.axboe@oracle.com, agk@redhat.com, balbir@linux.vnet.ibm.com, paolo.valente@unimore.it, fernando@oss.ntt.co.jp, mikew@google.com, jmoyer@redhat.com, nauman@google.com, m-ikeda@ds.jp.nec.com, lizf@cn.fujitsu.com, fchecconi@gmail.com, akpm@linux-foundation.org, jbaron@redhat.com, linux-kernel@vger.kernel.org, s-uchida@ap.jp.nec.com, righi.andrea@gmail.com, containers@lists.linux-foundation.org Subject: [dm-devel] Re: [PATCH 05/20] io-controller: Common hierarchical fair queuing code in elevaotor layer X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com Vivek Goyal wrote: ... > +#ifdef CONFIG_GROUP_IOSCHED > +extern int io_group_allow_merge(struct request *rq, struct bio *bio); > +extern void io_ioq_move(struct elevator_queue *e, struct io_queue *ioq, io_ioq_move is not used anymore, removing the dead code. Singed-off-by: Gui Jianfeng --- block/elevator-fq.h | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/block/elevator-fq.h b/block/elevator-fq.h index 1c99e83..24a3af9 100644 --- a/block/elevator-fq.h +++ b/block/elevator-fq.h @@ -537,8 +537,6 @@ static inline struct io_group *ioq_to_io_group(struct io_queue *ioq) #ifdef CONFIG_GROUP_IOSCHED extern int io_group_allow_merge(struct request *rq, struct bio *bio); -extern void io_ioq_move(struct elevator_queue *e, struct io_queue *ioq, - struct io_group *iog); static inline bfq_weight_t iog_weight(struct io_group *iog) { return iog->entity.weight; @@ -588,15 +586,6 @@ static inline int update_requeue(struct io_queue *ioq, int requeue) } #else /* !GROUP_IOSCHED */ -/* - * No ioq movement is needed in case of flat setup. root io group gets cleaned - * up upon elevator exit and before that it has been made sure that both - * active and idle tree are empty. - */ -static inline void io_ioq_move(struct elevator_queue *e, struct io_queue *ioq, - struct io_group *iog) -{ -} static inline int io_group_allow_merge(struct request *rq, struct bio *bio) {