Commit 64414da2 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Greg Kroah-Hartman
Browse files

kobject: align stacktrace levels to logging message 



Without an explicit level the stacktraces are printed at a default
level.
If this level does not match the one from the logging level it may
happen that the stacktrace is shown without the message or vice versa.

Both these cases are confusing, so make sure the user always sees both,
the message and the stacktrace.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Link: https://lore.kernel.org/r/20230311-kobject-warning-v1-2-1ebba4f71fb5@weissschuh.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98406333

lib/kobject.c

+3 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ void kobject_init(struct kobject *kobj, const struct kobj_type *ktype) 
		/* do not error out as sometimes we can recover */

		pr_err("kobject (%p): tried to init an initialized object, something is seriously wrong.\n",

		       kobj);

		dump_stack();

		dump_stack_lvl(KERN_ERR);

	}



	kobject_init_internal(kobj);
@@ -349,7 +349,7 @@ void kobject_init(struct kobject *kobj, const struct kobj_type *ktype) 


error:

	pr_err("kobject (%p): %s\n", kobj, err_str);

	dump_stack();

	dump_stack_lvl(KERN_ERR);

}

EXPORT_SYMBOL(kobject_init);
@@ -413,7 +413,7 @@ int kobject_add(struct kobject *kobj, struct kobject *parent, 
	if (!kobj->state_initialized) {

		pr_err("kobject '%s' (%p): tried to add an uninitialized object, something is seriously wrong.\n",

		       kobject_name(kobj), kobj);

		dump_stack();

		dump_stack_lvl(KERN_ERR);

		return -EINVAL;

	}

	va_start(args, fmt);