diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-18 09:05:35 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-25 07:40:31 +0300 |
| commit | 1eada11c88251e0a30ce5690d2607bb4293b3564 (patch) | |
| tree | 8ee96c0300fadd21bdbd872d55cac3c19b4cedbc /mm | |
| parent | cf15126b3d4511e06e5299781ab74922590900be (diff) | |
| download | linux-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>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 9 |
1 files changed, 4 insertions, 5 deletions
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) |