From ee821f6dac463114ad2fe214046f689878021b00 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 17 Dec 2007 23:05:35 -0700
Subject: [PATCH] --- yaml --- r: 75823 b: refs/heads/master c:
 1eada11c88251e0a30ce5690d2607bb4293b3564 h: refs/heads/master i:   75821:
 ddfd1b7b945d4f3f72f0edbcce43a65ac6a46639   75819:
 ac0f72a8a88bb8fc7e7d6167ddb25aa97fdfd0f4   75815:
 728d31770b69e4f04083e4cab4ef0b3bd08513d9   75807:
 2f4ca6509b0f3cb6cae0b4f675ab564e5c9be174 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8291b4acda87..eabbb88849c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf15126b3d4511e06e5299781ab74922590900be
+refs/heads/master: 1eada11c88251e0a30ce5690d2607bb4293b3564
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index d26177fb293b..5cc4b7dddb50 100644
--- a/trunk/mm/slub.c
+++ b/trunk/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)