| Message ID | 20250211214842.1806521-2-shyamsaini@linux.microsoft.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Properly handle module_kobject creation | expand |
| Context | Check | Description |
|---|---|---|
| mcgrof/vmtest-modules-next-PR | fail | PR summary |
| mcgrof/vmtest-modules-next-VM_Test-0 | success | Logs for Run CI tests |
| mcgrof/vmtest-modules-next-VM_Test-1 | success | Logs for Run CI tests |
| mcgrof/vmtest-modules-next-VM_Test-2 | fail | Logs for cleanup / Archive results and cleanup |
| mcgrof/vmtest-modules-next-VM_Test-3 | fail | Logs for cleanup / Archive results and cleanup |
| mcgrof/vmtest-modules-next-VM_Test-4 | fail | Logs for setup / Setup kdevops environment |
| mcgrof/vmtest-modules-next-VM_Test-5 | fail | Logs for setup / Setup kdevops environment |
On 2/11/25 22:48, Shyam Saini wrote: > 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> > --- > kernel/params.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/kernel/params.c b/kernel/params.c > index 0074d29c9b80..4b43baaf7c83 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,10 +805,9 @@ 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; > - > /* We need to remove old parameters before adding more. */ > if (mk->mp) > sysfs_remove_group(&mk->kobj, &mk->mp->grp); Nit: Please restore the accidentally removed empty line.
diff --git a/kernel/params.c b/kernel/params.c index 0074d29c9b80..4b43baaf7c83 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,10 +805,9 @@ 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; - /* We need to remove old parameters before adding more. */ if (mk->mp) sysfs_remove_group(&mk->kobj, &mk->mp->grp); @@ -876,7 +875,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);
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> --- kernel/params.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)