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

Commit d5bf0291 authored by Jens Axboe's avatar Jens Axboe
Browse files

Revert "block: add __init to blkcg_policy_register" 

This reverts commit a2d445d4.

The original commit is buggy, we do use the registration functions
at runtime for modular builds.
parent a5049a8a

block/blk-cgroup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1090,7 +1090,7 @@ EXPORT_SYMBOL_GPL(blkcg_deactivate_policy); 
 * Register @pol with blkcg core.  Might sleep and @pol may be modified on

 * Register @pol with blkcg core.  Might sleep and @pol may be modified on

 * successful registration.  Returns 0 on success and -errno on failure.

 * 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;

	int i, ret;

block/blk-cgroup.h

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

void blkcg_exit_queue(struct request_queue *q);





/* Blkio controller policy registration */

/* 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);

void blkcg_policy_unregister(struct blkcg_policy *pol);

int blkcg_activate_policy(struct request_queue *q,

int blkcg_activate_policy(struct request_queue *q,

			  const struct blkcg_policy *pol);

			  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 int blkcg_init_queue(struct request_queue *q) { return 0; }

static inline void blkcg_drain_queue(struct request_queue *q) { }

static inline void blkcg_drain_queue(struct request_queue *q) { }

static inline void blkcg_exit_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 void blkcg_policy_unregister(struct blkcg_policy *pol) { }

static inline int blkcg_activate_policy(struct request_queue *q,

static inline int blkcg_activate_policy(struct request_queue *q,

					const struct blkcg_policy *pol) { return 0; }

					const struct blkcg_policy *pol) { return 0; }