From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 18 Dec 2007 06:05:35 +0000 (-0700)
Subject: Kobject: convert mm/slub.c to use kobject_init/add_ng()
X-Git-Tag: firefly_0821_release~23736^2~61
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1eada11c88251e0a30ce5690d2607bb4293b3564;p=firefly-linux-kernel-4.4.55.git

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>
---

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)