Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751642AbdFFMVK (ORCPT ); Tue, 6 Jun 2017 08:21:10 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36181 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751345AbdFFMUP (ORCPT ); Tue, 6 Jun 2017 08:20:15 -0400 From: Corentin Labbe To: jeyu@redhat.com, rusty@rustcorp.com.au Cc: linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH v2 1/2] kernel/module.c: Invert add_usage_link and del_usage_link functions Date: Tue, 6 Jun 2017 14:17:39 +0200 Message-Id: <20170606121740.350-2-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170606121740.350-1-clabbe.montjoie@gmail.com> References: <20170606121740.350-1-clabbe.montjoie@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1520 Lines: 52 This patch just swap del_usage_link() before add_usage_link(). Signed-off-by: Corentin Labbe --- kernel/module.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index e3e9dbba6a5b..983b81f6d4ba 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1663,29 +1663,29 @@ static inline void remove_notes_attrs(struct module *mod) } #endif /* CONFIG_KALLSYMS */ -static void add_usage_links(struct module *mod) +static void del_usage_links(struct module *mod) { #ifdef CONFIG_MODULE_UNLOAD struct module_use *use; - int nowarn; mutex_lock(&module_mutex); - list_for_each_entry(use, &mod->target_list, target_list) { - nowarn = sysfs_create_link(use->target->holders_dir, - &mod->mkobj.kobj, mod->name); - } + list_for_each_entry(use, &mod->target_list, target_list) + sysfs_remove_link(use->target->holders_dir, mod->name); mutex_unlock(&module_mutex); #endif } -static void del_usage_links(struct module *mod) +static void add_usage_links(struct module *mod) { #ifdef CONFIG_MODULE_UNLOAD struct module_use *use; + int nowarn; mutex_lock(&module_mutex); - list_for_each_entry(use, &mod->target_list, target_list) - sysfs_remove_link(use->target->holders_dir, mod->name); + list_for_each_entry(use, &mod->target_list, target_list) { + nowarn = sysfs_create_link(use->target->holders_dir, + &mod->mkobj.kobj, mod->name); + } mutex_unlock(&module_mutex); #endif } -- 2.13.0