---

yaml --- r: 75823 b: refs/heads/master c: 1eada11 h: refs/heads/master i: 75821: ddfd1b7 75819: ac0f72a 75815: 728d317 75807: 2f4ca65 v: v3
git-mirror · Jan 25, 2008 · ee821f6 · ee821f6
1 parent 4d05365
commit ee821f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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)