summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/blk-throttle.c1
-rw-r--r--block/blk.h15
-rw-r--r--include/linux/blkdev.h14
3 files changed, 15 insertions, 15 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index a19f58c6fc3a..f3f495ea4eeb 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -10,6 +10,7 @@
10#include <linux/bio.h> 10#include <linux/bio.h>
11#include <linux/blktrace_api.h> 11#include <linux/blktrace_api.h>
12#include "blk-cgroup.h" 12#include "blk-cgroup.h"
13#include "blk.h"
13 14
14/* Max dispatch from a group in 1 round */ 15/* Max dispatch from a group in 1 round */
15static int throtl_grp_quantum = 8; 16static int throtl_grp_quantum = 8;
diff --git a/block/blk.h b/block/blk.h
index 20b900a377c9..da247ba2aeaf 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -188,4 +188,17 @@ static inline int blk_do_io_stat(struct request *rq)
188 (rq->cmd_flags & REQ_DISCARD)); 188 (rq->cmd_flags & REQ_DISCARD));
189} 189}
190 190
191#endif 191#ifdef CONFIG_BLK_DEV_THROTTLING
192extern int blk_throtl_bio(struct request_queue *q, struct bio **bio);
193extern int blk_throtl_init(struct request_queue *q);
194extern void blk_throtl_exit(struct request_queue *q);
195#else /* CONFIG_BLK_DEV_THROTTLING */
196static inline int blk_throtl_bio(struct request_queue *q, struct bio **bio)
197{
198 return 0;
199}
200static inline int blk_throtl_init(struct request_queue *q) { return 0; }
201static inline void blk_throtl_exit(struct request_queue *q) { }
202#endif /* CONFIG_BLK_DEV_THROTTLING */
203
204#endif /* BLK_INTERNAL_H */
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 0b68044e7abb..5267cd2f20dc 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1197,20 +1197,6 @@ static inline uint64_t rq_io_start_time_ns(struct request *req)
1197} 1197}
1198#endif 1198#endif
1199 1199
1200#ifdef CONFIG_BLK_DEV_THROTTLING
1201extern int blk_throtl_init(struct request_queue *q);
1202extern void blk_throtl_exit(struct request_queue *q);
1203extern int blk_throtl_bio(struct request_queue *q, struct bio **bio);
1204#else /* CONFIG_BLK_DEV_THROTTLING */
1205static inline int blk_throtl_bio(struct request_queue *q, struct bio **bio)
1206{
1207 return 0;
1208}
1209
1210static inline int blk_throtl_init(struct request_queue *q) { return 0; }
1211static inline int blk_throtl_exit(struct request_queue *q) { return 0; }
1212#endif /* CONFIG_BLK_DEV_THROTTLING */
1213
1214#define MODULE_ALIAS_BLOCKDEV(major,minor) \ 1200#define MODULE_ALIAS_BLOCKDEV(major,minor) \
1215 MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor)) 1201 MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))
1216#define MODULE_ALIAS_BLOCKDEV_MAJOR(major) \ 1202#define MODULE_ALIAS_BLOCKDEV_MAJOR(major) \