diff options
| author | Jens Axboe | 2014-06-23 00:31:56 +0200 |
|---|---|---|
| committer | Jens Axboe | 2014-06-23 00:34:11 +0200 |
| commit | d5bf02914ea3ecf28db4f830f136dc04146b2317 (patch) | |
| tree | bdb623c506ba24ca29a2fffc595ef912cf8f7b3d /block | |
| parent | blkcg: fix use-after-free in __blkg_release_rcu() by making blkcg_gq refcnt a... (diff) | |
| download | kernel-qcow2-linux-d5bf02914ea3ecf28db4f830f136dc04146b2317.tar.gz kernel-qcow2-linux-d5bf02914ea3ecf28db4f830f136dc04146b2317.tar.xz kernel-qcow2-linux-d5bf02914ea3ecf28db4f830f136dc04146b2317.zip | |
Revert "block: add __init to blkcg_policy_register"
This reverts commit a2d445d440003f2d70ee4cd4970ea82ace616fee.
The original commit is buggy, we do use the registration functions
at runtime for modular builds.
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.c | 2 | ||||
| -rw-r--r-- | block/blk-cgroup.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 1463ca6b7aae..b9f4cc494ece 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1090,7 +1090,7 @@ EXPORT_SYMBOL_GPL(blkcg_deactivate_policy); * Register @pol with blkcg core. Might sleep and @pol may be modified on * successful registration. Returns 0 on success and -errno on failure. */ -int __init blkcg_policy_register(struct blkcg_policy *pol) +int blkcg_policy_register(struct blkcg_policy *pol) { int i, ret; diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 1c401b057151..d3fd7aa3d2a3 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -146,7 +146,7 @@ void blkcg_drain_queue(struct request_queue *q); void blkcg_exit_queue(struct request_queue *q); /* Blkio controller policy registration */ -int __init blkcg_policy_register(struct blkcg_policy *pol); +int blkcg_policy_register(struct blkcg_policy *pol); void blkcg_policy_unregister(struct blkcg_policy *pol); int blkcg_activate_policy(struct request_queue *q, const struct blkcg_policy *pol); @@ -577,7 +577,7 @@ static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, void *key) { ret static inline int blkcg_init_queue(struct request_queue *q) { return 0; } static inline void blkcg_drain_queue(struct request_queue *q) { } static inline void blkcg_exit_queue(struct request_queue *q) { } -static inline int __init blkcg_policy_register(struct blkcg_policy *pol) { return 0; } +static inline int blkcg_policy_register(struct blkcg_policy *pol) { return 0; } static inline void blkcg_policy_unregister(struct blkcg_policy *pol) { } static inline int blkcg_activate_policy(struct request_queue *q, const struct blkcg_policy *pol) { return 0; } |