| Message ID | 20220929121039.702873-1-linux@rasmusvillemoes.dk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | module: remove redundant module_sysfs_initialized variable | expand |
On Thu, 29 Sep 2022, Rasmus Villemoes wrote: > The variable module_sysfs_initialized is used for checking whether > module_kset has been initialized. Checking module_kset itself works > just fine for that. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Reviewed-by: Miroslav Benes <mbenes@suse.cz> M
On Thu, Sep 29, 2022 at 02:10:39PM +0200, Rasmus Villemoes wrote: > The variable module_sysfs_initialized is used for checking whether > module_kset has been initialized. Checking module_kset itself works > just fine for that. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Looks pretty sane to me, thanks! I'll queue this up for 6.2 as we didn't get a chance to spin test this for 6.1 on linux-next. Luis
Le 04/10/2022 à 01:40, Luis Chamberlain a écrit : > On Thu, Sep 29, 2022 at 02:10:39PM +0200, Rasmus Villemoes wrote: >> The variable module_sysfs_initialized is used for checking whether >> module_kset has been initialized. Checking module_kset itself works >> just fine for that. >> >> Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > > Looks pretty sane to me, thanks! I'll queue this up for 6.2 > as we didn't get a chance to spin test this for 6.1 on linux-next. > Maybe you can mention that this is a leftover from commit 7405c1e15edf ("kset: convert /sys/module to use kset_create") Christophe
On Tue, Oct 04, 2022 at 04:35:43AM +0000, Christophe Leroy wrote: > > > Le 04/10/2022 à 01:40, Luis Chamberlain a écrit : > > On Thu, Sep 29, 2022 at 02:10:39PM +0200, Rasmus Villemoes wrote: > >> The variable module_sysfs_initialized is used for checking whether > >> module_kset has been initialized. Checking module_kset itself works > >> just fine for that. > >> > >> Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > > > > Looks pretty sane to me, thanks! I'll queue this up for 6.2 > > as we didn't get a chance to spin test this for 6.1 on linux-next. > > > > Maybe you can mention that this is a leftover from commit 7405c1e15edf > ("kset: convert /sys/module to use kset_create") Sure, did that. Luis
diff --git a/include/linux/module.h b/include/linux/module.h index 518296ea7f73..727176de2890 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -827,7 +827,6 @@ void *dereference_module_function_descriptor(struct module *mod, void *ptr) #ifdef CONFIG_SYSFS extern struct kset *module_kset; extern struct kobj_type module_ktype; -extern int module_sysfs_initialized; #endif /* CONFIG_SYSFS */ #define symbol_request(x) try_then_request_module(symbol_get(x), "symbol:" #x) diff --git a/kernel/module/sysfs.c b/kernel/module/sysfs.c index ce68f821dcd1..c921bf044050 100644 --- a/kernel/module/sysfs.c +++ b/kernel/module/sysfs.c @@ -340,7 +340,7 @@ static int mod_sysfs_init(struct module *mod) int err; struct kobject *kobj; - if (!module_sysfs_initialized) { + if (!module_kset) { pr_err("%s: module sysfs not initialized\n", mod->name); err = -EINVAL; goto out; diff --git a/kernel/params.c b/kernel/params.c index 5b92310425c5..8d4e9a3f0df2 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -940,7 +940,6 @@ static const struct kset_uevent_ops module_uevent_ops = { }; struct kset *module_kset; -int module_sysfs_initialized; static void module_kobj_release(struct kobject *kobj) { @@ -964,7 +963,6 @@ static int __init param_sysfs_init(void) __FILE__, __LINE__); return -ENOMEM; } - module_sysfs_initialized = 1; version_sysfs_builtin(); param_sysfs_builtin();
The variable module_sysfs_initialized is used for checking whether module_kset has been initialized. Checking module_kset itself works just fine for that. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- include/linux/module.h | 1 - kernel/module/sysfs.c | 2 +- kernel/params.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-)