Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f255651 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

kobject: replace '/' with '!' in name



Some (block) devices have a '/' in the name, and need special
handling. Let's have that rule to the core, so we can remove it
from the block class.

Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e105b8bf
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -216,13 +216,19 @@ static int kobject_add_internal(struct kobject *kobj)
static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
				  va_list vargs)
{
	/* Free the old name, if necessary. */
	kfree(kobj->name);
	const char *old_name = kobj->name;
	char *s;

	kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
	if (!kobj->name)
		return -ENOMEM;

	/* ewww... some of these buggers have '/' in the name ... */
	s = strchr(kobj->name, '/');
	if (s)
		s[0] = '!';

	kfree(old_name);
	return 0;
}