Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2d445d4 authored by Fabian Frederick's avatar Fabian Frederick Committed by Jens Axboe
Browse files

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: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent b5097e95

block/blk-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -1093,7 +1093,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 blkcg_policy_register(struct blkcg_policy *pol)

int __init blkcg_policy_register(struct blkcg_policy *pol)

{

	int i, ret;

block/blk-cgroup.h

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ void blkcg_drain_queue(struct request_queue *q); 
void blkcg_exit_queue(struct request_queue *q);



/* Blkio controller policy registration */

int blkcg_policy_register(struct blkcg_policy *pol);

int __init 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);
@@ -580,7 +580,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 blkcg_policy_register(struct blkcg_policy *pol) { return 0; }

static inline int __init 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; }