6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shyam Saini shyamsaini@linux.microsoft.com
[ Upstream commit bbc9462f0cb0c8917a4908e856731708f0cee910 ]
The locate_module_kobject() function looks up an existing module_kobject for a given module name. If it cannot find the corresponding module_kobject, it creates one for the given name.
This commit renames locate_module_kobject() to lookup_or_create_module_kobject() to better describe its operations.
This doesn't change anything functionality wise.
Suggested-by: Rasmus Villemoes linux@rasmusvillemoes.dk Signed-off-by: Shyam Saini shyamsaini@linux.microsoft.com Link: https://lore.kernel.org/r/20250227184930.34163-2-shyamsaini@linux.microsoft.... Signed-off-by: Petr Pavlu petr.pavlu@suse.com Stable-dep-of: f95bbfe18512 ("drivers: base: handle module_kobject creation") Signed-off-by: Sasha Levin sashal@kernel.org --- kernel/params.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/params.c b/kernel/params.c index 2e447f8ae183e..d62a116918cd0 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -763,7 +763,7 @@ void destroy_params(const struct kernel_param *params, unsigned num) params[i].ops->free(params[i].arg); }
-static struct module_kobject * __init locate_module_kobject(const char *name) +static struct module_kobject * __init lookup_or_create_module_kobject(const char *name) { struct module_kobject *mk; struct kobject *kobj; @@ -805,7 +805,7 @@ static void __init kernel_add_sysfs_param(const char *name, struct module_kobject *mk; int err;
- mk = locate_module_kobject(name); + mk = lookup_or_create_module_kobject(name); if (!mk) return;
@@ -876,7 +876,7 @@ static void __init version_sysfs_builtin(void) int err;
for (vattr = __start___modver; vattr < __stop___modver; vattr++) { - mk = locate_module_kobject(vattr->module_name); + mk = lookup_or_create_module_kobject(vattr->module_name); if (mk) { err = sysfs_create_file(&mk->kobj, &vattr->mattr.attr); WARN_ON_ONCE(err);