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>

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 0bd1fd3d29df5541fdacef2a55bbd862a9941555..1671c731800e417a2c79a6f2779acbfa0c57b4ca 100644 (file)
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -184,9 +184,7 @@ static struct kobj_type btrfs_super_ktype = {
        .release        = btrfs_super_release,
 };
 
-static struct kset btrfs_kset = {
-       .kobj   = {.name = "btrfs"},
-};
+static struct kset btrfs_kset;
 
 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()
 {
        kobj_set_kset_s(&btrfs_kset, fs_subsys);
+       kobject_set_name(&btrfs_kset.kobj, "btrfs");
        return kset_register(&btrfs_kset);
 }