aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-12-18 01:05:35 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:31 -0500
commitcf15126b3d4511e06e5299781ab74922590900be (patch)
tree6049b91759b2e80c79ba4340d4cd83f7befd3778 /kernel
parente43b9192c59402685bd1f809068dd13aa5931570 (diff)
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')
-rw-r--r--kernel/user.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/user.c b/kernel/user.c
index 7f17e6e8fd6..ab4fd706993 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -181,13 +181,12 @@ static int uids_user_create(struct user_struct *up)
181 int error; 181 int error;
182 182
183 memset(kobj, 0, sizeof(struct kobject)); 183 memset(kobj, 0, sizeof(struct kobject));
184 kobj->ktype = &uids_ktype;
185 kobj->kset = uids_kset; 184 kobj->kset = uids_kset;
186 kobject_init(kobj); 185 error = kobject_init_and_add(kobj, &uids_ktype, NULL, "%d", up->uid);
187 kobject_set_name(&up->kobj, "%d", up->uid); 186 if (error) {
188 error = kobject_add(kobj); 187 kobject_put(kobj);
189 if (error)
190 goto done; 188 goto done;
189 }
191 190
192 kobject_uevent(kobj, KOBJ_ADD); 191 kobject_uevent(kobj, KOBJ_ADD);
193done: 192done: