Commit cf15126b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Kobject: convert kernel/user.c to use kobject_init/add_ng() 



This converts the code to use the new kobject functions, cleaning up the
logic in doing so.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e43b9192

kernel/user.c

+4 −5
Original line number Diff line number Diff line
@@ -181,13 +181,12 @@ static int uids_user_create(struct user_struct *up) 
	int error;



	memset(kobj, 0, sizeof(struct kobject));

	kobj->ktype = &uids_ktype;

	kobj->kset = uids_kset;

	kobject_init(kobj);

	kobject_set_name(&up->kobj, "%d", up->uid);

	error = kobject_add(kobj);

	if (error)

	error = kobject_init_and_add(kobj, &uids_ktype, NULL, "%d", up->uid);

	if (error) {

		kobject_put(kobj);

		goto done;

	}



	kobject_uevent(kobj, KOBJ_ADD);

done: