From 6dc5ae73cdf50271bf1132dec97a9d7caebc67a2 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 19 Oct 2011 14:31:18 +0200
Subject: [PATCH] --- yaml --- r: 273795 b: refs/heads/master c:
 bc9fcbf9cb8ec76d340da16fbf48a9a316e14c52 h: refs/heads/master i:   273793:
 1bbaced7063a789369a6d884117cd96250f71576   273791:
 5ff68f31b3ff646092c3e070ebe6fd8755d1fb2f v: v3

---
 [refs]                       |  2 +-
 trunk/block/blk-throttle.c   |  1 +
 trunk/block/blk.h            | 15 ++++++++++++++-
 trunk/include/linux/blkdev.h | 14 --------------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 288b142316d8..75e961aca7e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ece84241b93c4693bfe0a8ec9a043a16d216d0cd
+refs/heads/master: bc9fcbf9cb8ec76d340da16fbf48a9a316e14c52
diff --git a/trunk/block/blk-throttle.c b/trunk/block/blk-throttle.c
index a19f58c6fc3a..f3f495ea4eeb 100644
--- a/trunk/block/blk-throttle.c
+++ b/trunk/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/trunk/block/blk.h b/trunk/block/blk.h
index 20b900a377c9..da247ba2aeaf 100644
--- a/trunk/block/blk.h
+++ b/trunk/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/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index 0b68044e7abb..5267cd2f20dc 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -1197,20 +1197,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) \