Btrfs: sysfs compile fixup

Just use kobject_set_name(), that works in all kernels (I think...).
Kernels newer than 2.6.23 currently fail with:

/home/axboe/git/btrfs/btrfs-unstable/sysfs.c:188: error: unknown field
'name' specified in initializer

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Jens Axboe 2007-10-19 09:23:08 -04:00 committed by Chris Mason
parent bbf0d0062d
commit b4a2a0edfd

View file

@ -184,9 +184,7 @@ static struct kobj_type btrfs_super_ktype = {
.release = btrfs_super_release, .release = btrfs_super_release,
}; };
static struct kset btrfs_kset = { static struct kset btrfs_kset;
.kobj = {.name = "btrfs"},
};
int btrfs_sysfs_add_super(struct btrfs_fs_info *fs) int btrfs_sysfs_add_super(struct btrfs_fs_info *fs)
{ {
@ -249,6 +247,7 @@ void btrfs_sysfs_del_super(struct btrfs_fs_info *fs)
int btrfs_init_sysfs() int btrfs_init_sysfs()
{ {
kobj_set_kset_s(&btrfs_kset, fs_subsys); kobj_set_kset_s(&btrfs_kset, fs_subsys);
kobject_set_name(&btrfs_kset.kobj, "btrfs");
return kset_register(&btrfs_kset); return kset_register(&btrfs_kset);
} }