Commit 1eada11c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cf15126b
...@@ -4025,13 +4025,12 @@ static int sysfs_slab_add(struct kmem_cache *s) ...@@ -4025,13 +4025,12 @@ static int sysfs_slab_add(struct kmem_cache *s)
name = create_unique_id(s); name = create_unique_id(s);
} }
kobject_set_name(&s->kobj, name);
s->kobj.kset = slab_kset; s->kobj.kset = slab_kset;
s->kobj.ktype = &slab_ktype; err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, name);
kobject_init(&s->kobj); if (err) {
err = kobject_add(&s->kobj); kobject_put(&s->kobj);
if (err)
return err; return err;
}
err = sysfs_create_group(&s->kobj, &slab_attr_group); err = sysfs_create_group(&s->kobj, &slab_attr_group);
if (err) if (err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment