lkml.org 
[lkml]   [2011]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 03/10] block: move blk_throtl prototypes to block/blk.h
On Tue, Oct 18, 2011 at 09:26:17PM -0700, Tejun Heo wrote:
> blk_throtl interface is block internal and there's no reason to have
> them in linux/blkdev.h. Move them to block/blk.h.
>
> This patch doesn't introduce any functional change.
>

Looks good to me.

Acked-by: Vivek Goyal <vgoyal@redhat.com>

Vivek

> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Vivek Goyal <vgoyal@redhat.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> ---
> block/blk-throttle.c | 1 +
> block/blk.h | 15 ++++++++++++++-
> include/linux/blkdev.h | 14 --------------
> 3 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/block/blk-throttle.c b/block/blk-throttle.c
> index a19f58c..f3f495e 100644
> --- a/block/blk-throttle.c
> +++ b/block/blk-throttle.c
> @@ -10,6 +10,7 @@
> #include <linux/bio.h>
> #include <linux/blktrace_api.h>
> #include "blk-cgroup.h"
> +#include "blk.h"
>
> /* Max dispatch from a group in 1 round */
> static int throtl_grp_quantum = 8;
> diff --git a/block/blk.h b/block/blk.h
> index 20b900a..da247ba 100644
> --- a/block/blk.h
> +++ b/block/blk.h
> @@ -188,4 +188,17 @@ static inline int blk_do_io_stat(struct request *rq)
> (rq->cmd_flags & REQ_DISCARD));
> }
>
> -#endif
> +#ifdef CONFIG_BLK_DEV_THROTTLING
> +extern int blk_throtl_bio(struct request_queue *q, struct bio **bio);
> +extern int blk_throtl_init(struct request_queue *q);
> +extern void blk_throtl_exit(struct request_queue *q);
> +#else /* CONFIG_BLK_DEV_THROTTLING */
> +static inline int blk_throtl_bio(struct request_queue *q, struct bio **bio)
> +{
> + return 0;
> +}
> +static inline int blk_throtl_init(struct request_queue *q) { return 0; }
> +static inline void blk_throtl_exit(struct request_queue *q) { }
> +#endif /* CONFIG_BLK_DEV_THROTTLING */
> +
> +#endif /* BLK_INTERNAL_H */
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index bf65f06..d98d7d6 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -1198,20 +1198,6 @@ static inline uint64_t rq_io_start_time_ns(struct request *req)
> }
> #endif
>
> -#ifdef CONFIG_BLK_DEV_THROTTLING
> -extern int blk_throtl_init(struct request_queue *q);
> -extern void blk_throtl_exit(struct request_queue *q);
> -extern int blk_throtl_bio(struct request_queue *q, struct bio **bio);
> -#else /* CONFIG_BLK_DEV_THROTTLING */
> -static inline int blk_throtl_bio(struct request_queue *q, struct bio **bio)
> -{
> - return 0;
> -}
> -
> -static inline int blk_throtl_init(struct request_queue *q) { return 0; }
> -static inline int blk_throtl_exit(struct request_queue *q) { return 0; }
> -#endif /* CONFIG_BLK_DEV_THROTTLING */
> -
> #define MODULE_ALIAS_BLOCKDEV(major,minor) \
> MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))
> #define MODULE_ALIAS_BLOCKDEV_MAJOR(major) \
> --
> 1.7.3.1


\
 
 \ /
  Last update: 2011-10-19 15:37    [W:1.404 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site