| From | Greg Kroah-Hartman <> | Subject | [PATCH 134/196] Kobject: convert kernel/user.c to use kobject_init/add_ng() | Date | Thu, 24 Jan 2008 23:32:43 -0800 |
| |
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: Greg Kroah-Hartman <gregkh@suse.de> --- kernel/user.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/kernel/user.c b/kernel/user.c index 7f17e6e..ab4fd70 100644 --- a/kernel/user.c +++ b/kernel/user.c @@ -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: -- 1.5.3.8
|