diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-17 23:05:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 20:40:31 -0800 |
| commit | cf15126b3d4511e06e5299781ab74922590900be (patch) | |
| tree | 6049b91759b2e80c79ba4340d4cd83f7befd3778 /kernel/user.c | |
| parent | e43b9192c59402685bd1f809068dd13aa5931570 (diff) | |
| download | linux-stable-cf15126b3d4511e06e5299781ab74922590900be.tar.gz linux-stable-cf15126b3d4511e06e5299781ab74922590900be.tar.bz2 linux-stable-cf15126b3d4511e06e5299781ab74922590900be.zip | |
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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/user.c')
| -rw-r--r-- | kernel/user.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/user.c b/kernel/user.c index 7f17e6e8fd65..ab4fd706993b 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: |