Kobject: convert mm/slub.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: Christoph Lameter <clameter@sgi.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 4 insertions, 5 deletions

diff --git a/mm/slub.c b/mm/slub.c
index d26177fb293b..5cc4b7dddb50 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4025,13 +4025,12 @@ static int sysfs_slab_add(struct kmem_cache *s)
                 name = create_unique_id(s);
         }
 
-        kobject_set_name(&s->kobj, name);
         s->kobj.kset = slab_kset;
-        s->kobj.ktype = &slab_ktype;
-        kobject_init(&s->kobj);
-        err = kobject_add(&s->kobj);
-        if (err)
+        err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, name);
+        if (err) {
+                kobject_put(&s->kobj);
                 return err;
+        }
 
         err = sysfs_create_group(&s->kobj, &slab_attr_group);
         if (err)