diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-18 06:05:35 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-25 04:40:31 (GMT) |
commit | 1eada11c88251e0a30ce5690d2607bb4293b3564 (patch) | |
tree | 8ee96c0300fadd21bdbd872d55cac3c19b4cedbc | |
parent | cf15126b3d4511e06e5299781ab74922590900be (diff) | |
download | linux-fsl-qoriq-1eada11c88251e0a30ce5690d2607bb4293b3564.tar.xz |
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>
-rw-r--r-- | mm/slub.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -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) |