Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753105AbaFWJfP (ORCPT ); Mon, 23 Jun 2014 05:35:15 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:40719 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753080AbaFWJfM (ORCPT ); Mon, 23 Jun 2014 05:35:12 -0400 Date: Mon, 23 Jun 2014 02:35:09 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Fabian Frederick cc: linux-kernel@vger.kernel.org, Jens Axboe , Damien Wyart , Andrew Morton Subject: Re: [PATCH 1/1] Revert "block: add __init to blkcg_policy_register" In-Reply-To: <1403352321-6353-1-git-send-email-fabf@skynet.be> Message-ID: References: <1403352321-6353-1-git-send-email-fabf@skynet.be> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 21 Jun 2014, Fabian Frederick wrote: > This reverts commit a2d445d44000 > > Adding __init to blkcg_policy_register makes it unreliable when > loading cfq at runtime. > > (Similar problem to b5097e956a4d "block: add __init to elv_register" > reported by Damien Wyart). > > Cc: Jens Axboe > Cc: Damien Wyart > Cc: Andrew Morton > Signed-off-by: Fabian Frederick > --- > block/blk-cgroup.c | 2 +- > 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 069bc20..9f5bce3 100644 > --- a/block/blk-cgroup.c > +++ b/block/blk-cgroup.c > @@ -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 __init blkcg_policy_register(struct blkcg_policy *pol) > +int blkcg_policy_register(struct blkcg_policy *pol) > { > int i, ret; > This is the second such revert from you for __init annotations, have you double checked all the other patches you've sent? > diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h > index cbb7f94..d692b29 100644 > --- a/block/blk-cgroup.h > +++ b/block/blk-cgroup.h > @@ -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 __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); > @@ -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 __init blkcg_policy_register(struct blkcg_policy *pol) { return 0; } > +static inline int blkcg_policy_register(struct blkcg_policy *pol) { return 0; } Why would you have marked an inline function as __init in the first place? > 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/