aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-10 14:18:36 -0400
committerJens Axboe <axboe@fb.com>2014-06-10 15:13:12 -0400
commita2d445d440003f2d70ee4cd4970ea82ace616fee (patch)
tree001d0cda6d39b90de62451fd56a4fc5a1a7e92da
parentb5097e956a4d2919ee248d6481e4204c5568ed5c (diff)
block: add __init to blkcg_policy_register
blkcg_policy_register is only called by __init functions: __init cfq_init __init throtl_init Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--block/blk-cgroup.c2
-rw-r--r--block/blk-cgroup.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 1039fb9ff5f5..5aa9b8b8a362 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1093,7 +1093,7 @@ EXPORT_SYMBOL_GPL(blkcg_deactivate_policy);
1093 * Register @pol with blkcg core. Might sleep and @pol may be modified on 1093 * Register @pol with blkcg core. Might sleep and @pol may be modified on
1094 * successful registration. Returns 0 on success and -errno on failure. 1094 * successful registration. Returns 0 on success and -errno on failure.
1095 */ 1095 */
1096int blkcg_policy_register(struct blkcg_policy *pol) 1096int __init blkcg_policy_register(struct blkcg_policy *pol)
1097{ 1097{
1098 int i, ret; 1098 int i, ret;
1099 1099
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 371fe8e92ab5..5480adedd387 100644
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -145,7 +145,7 @@ void blkcg_drain_queue(struct request_queue *q);
145void blkcg_exit_queue(struct request_queue *q); 145void blkcg_exit_queue(struct request_queue *q);
146 146
147/* Blkio controller policy registration */ 147/* Blkio controller policy registration */
148int blkcg_policy_register(struct blkcg_policy *pol); 148int __init blkcg_policy_register(struct blkcg_policy *pol);
149void blkcg_policy_unregister(struct blkcg_policy *pol); 149void blkcg_policy_unregister(struct blkcg_policy *pol);
150int blkcg_activate_policy(struct request_queue *q, 150int blkcg_activate_policy(struct request_queue *q,
151 const struct blkcg_policy *pol); 151 const struct blkcg_policy *pol);
@@ -580,7 +580,7 @@ static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, void *key) { ret
580static inline int blkcg_init_queue(struct request_queue *q) { return 0; } 580static inline int blkcg_init_queue(struct request_queue *q) { return 0; }
581static inline void blkcg_drain_queue(struct request_queue *q) { } 581static inline void blkcg_drain_queue(struct request_queue *q) { }
582static inline void blkcg_exit_queue(struct request_queue *q) { } 582static inline void blkcg_exit_queue(struct request_queue *q) { }
583static inline int blkcg_policy_register(struct blkcg_policy *pol) { return 0; } 583static inline int __init blkcg_policy_register(struct blkcg_policy *pol) { return 0; }
584static inline void blkcg_policy_unregister(struct blkcg_policy *pol) { } 584static inline void blkcg_policy_unregister(struct blkcg_policy *pol) { }
585static inline int blkcg_activate_policy(struct request_queue *q, 585static inline int blkcg_activate_policy(struct request_queue *q,
586 const struct blkcg_policy *pol) { return 0; } 586 const struct blkcg_policy *pol) { return 0; }