diff mbox

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

Message ID 4A28E710.5080307@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gui Jianfeng June 5, 2009, 9:36 a.m. UTC 
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 <guijianfeng@cn.fujitsu.com>
---
 block/elevator-fq.h |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

Comments

Vivek Goyal June 5, 2009, 1:21 p.m. UTC | #1 
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 <guijianfeng@cn.fujitsu.com>
> ---
>  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
> 

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
diff mbox

Patch

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)
 {