From: Vivek Goyal <vgoyal@redhat.com>
To: Tejun Heo <tj@kernel.org>
Cc: axboe@kernel.dk, linux-kernel@vger.kernel.org,
ctalbott@google.com, ni@google.com
Subject: Re: [PATCH 03/10] block: move blk_throtl prototypes to block/blk.h
Date: Wed, 19 Oct 2011 09:33:58 -0400 [thread overview]
Message-ID: <20111019133358.GB1140@redhat.com> (raw)
In-Reply-To: <1318998384-22525-4-git-send-email-tj@kernel.org>
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
next prev parent reply other threads:[~2011-10-19 13:34 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-19 4:26 [PATCHSET block/for-next] fix request_queue life-cycle management Tejun Heo
2011-10-19 4:26 ` [PATCH 01/10] block: make gendisk hold a reference to its queue Tejun Heo
2011-10-19 4:26 ` [PATCH 02/10] block: fix genhd refcounting in blkio_policy_parse_and_set() Tejun Heo
2011-10-19 13:26 ` Vivek Goyal
2011-10-19 16:29 ` Tejun Heo
2011-10-19 16:59 ` Vivek Goyal
2011-10-19 22:05 ` Tejun Heo
2011-10-19 22:07 ` Tejun Heo
2011-10-19 23:51 ` Tejun Heo
2011-10-20 13:41 ` Vivek Goyal
2011-10-20 16:11 ` Tejun Heo
2011-10-20 16:16 ` Kay Sievers
2011-10-20 17:50 ` Vivek Goyal
2011-10-20 17:47 ` Vivek Goyal
2011-10-19 4:26 ` [PATCH 03/10] block: move blk_throtl prototypes to block/blk.h Tejun Heo
2011-10-19 13:33 ` Vivek Goyal [this message]
2011-10-19 4:26 ` [PATCH 04/10] block: pass around REQ_* flags instead of broken down booleans during request alloc/free Tejun Heo
2011-10-19 13:44 ` Vivek Goyal
2011-10-19 16:31 ` Tejun Heo
2011-10-19 4:26 ` [PATCH 05/10] block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg() Tejun Heo
2011-10-19 13:52 ` Vivek Goyal
2011-10-19 16:35 ` Tejun Heo
2011-10-19 4:26 ` [PATCH 06/10] block: reorganize queue draining Tejun Heo
2011-10-19 4:26 ` [PATCH 07/10] block: reorganize throtl_get_tg() and blk_throtl_bio() Tejun Heo
2011-10-19 14:56 ` Vivek Goyal
2011-10-19 17:06 ` Tejun Heo
2011-10-19 17:19 ` Vivek Goyal
2011-10-19 17:30 ` Tejun Heo
2011-10-19 17:45 ` Vivek Goyal
2011-10-19 17:49 ` Tejun Heo
2011-10-19 4:26 ` [PATCH 08/10] block: make get_request[_wait]() fail if queue is dead Tejun Heo
2011-10-19 15:22 ` Vivek Goyal
2011-10-19 4:26 ` [PATCH 09/10] block: drop @tsk from attempt_plug_merge() and explain sync rules Tejun Heo
2011-10-19 4:26 ` [PATCH 10/10] block: fix request_queue lifetime handling by making blk_queue_cleanup() proper shutdown Tejun Heo
2011-10-19 12:43 ` Jens Axboe
2011-10-19 17:13 ` Tejun Heo
2011-10-19 18:04 ` Jens Axboe
2011-10-19 16:18 ` Vivek Goyal
2011-10-19 17:12 ` Tejun Heo
2011-10-19 17:29 ` Vivek Goyal
2011-10-19 17:33 ` Tejun Heo
2011-10-19 4:29 ` [PATCHSET block/for-next] fix request_queue life-cycle management Tejun Heo
2011-10-19 12:44 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111019133358.GB1140@redhat.com \
--to=vgoyal@redhat.com \
--cc=axboe@kernel.dk \
--cc=ctalbott@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ni@google.com \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).