From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752656AbdLHAQ3 (ORCPT ); Thu, 7 Dec 2017 19:16:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:59718 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752479AbdLHAPq (ORCPT ); Thu, 7 Dec 2017 19:15:46 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50B6221985 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mcgrof@kernel.org From: "Luis R. Rodriguez" To: jeyu@kernel.org, rusty@rustcorp.com.au Cc: keescook@chromium.org, tixxdz@gmail.com, mbenes@suse.cz, atomlin@redhat.com, pmladek@suse.com, hare@suse.com, james.l.morris@oracle.com, ebiederm@xmission.com, davem@davemloft.net, akpm@linux-foundation.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH 2/3] module: move finished_loading() Date: Thu, 7 Dec 2017 16:15:39 -0800 Message-Id: <20171208001540.23696-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171208001540.23696-1-mcgrof@kernel.org> References: <20171208001540.23696-1-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This has no functional change, just moves a routine earlier as we'll make use of it next. Signed-off-by: Luis R. Rodriguez --- kernel/module.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index 195ef37e242a..fb2afcde5d20 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3287,6 +3287,27 @@ static bool blacklisted(const char *module_name) } core_param(module_blacklist, module_blacklist, charp, 0400); +/* Is this module of this name done loading? No locks held. */ +static bool finished_loading(const char *name) +{ + struct module *mod; + bool ret; + + /* + * The module_mutex should not be a heavily contended lock; + * if we get the occasional sleep here, we'll go an extra iteration + * in the wait_event_interruptible(), which is harmless. + */ + sched_annotate_sleep(); + mutex_lock(&module_mutex); + mod = find_module_all(name, strlen(name), true); + ret = !mod || mod->state == MODULE_STATE_LIVE + || mod->state == MODULE_STATE_GOING; + mutex_unlock(&module_mutex); + + return ret; +} + /* Module within temporary copy, this doesn't do any allocation */ static int early_mod_check(struct load_info *info, int flags, struct module *mod) @@ -3377,27 +3398,6 @@ static int post_relocation(struct module *mod, const struct load_info *info) return module_finalize(info->hdr, info->sechdrs, mod); } -/* Is this module of this name done loading? No locks held. */ -static bool finished_loading(const char *name) -{ - struct module *mod; - bool ret; - - /* - * The module_mutex should not be a heavily contended lock; - * if we get the occasional sleep here, we'll go an extra iteration - * in the wait_event_interruptible(), which is harmless. - */ - sched_annotate_sleep(); - mutex_lock(&module_mutex); - mod = find_module_all(name, strlen(name), true); - ret = !mod || mod->state == MODULE_STATE_LIVE - || mod->state == MODULE_STATE_GOING; - mutex_unlock(&module_mutex); - - return ret; -} - /* Call module constructors. */ static void do_mod_ctors(struct module *mod) { -- 2.15.0