2009-06-05 09:37:51

by Gui, Jianfeng/归 剑峰

Subject: Re: [PATCH 05/20] io-controller: Common hierarchical fair queuing code in elevaotor layer

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 <[email protected]>
---
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)
{
--
1.5.4.rc3

2009-06-05 13:23:23

by Vivek Goyal

Subject: Re: [PATCH 05/20] io-controller: Common hierarchical fair queuing code in elevaotor layer

On Fri, Jun 05, 2009 at 05:36:16PM +0800, Gui Jianfeng wrote:
> 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.
>

Thanks Gui. Will include the patch in next posting.

Vivek

> Singed-off-by: Gui Jianfeng <[email protected]>
> ---
> 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)
> {
> --
> 1.5.4.rc3
>