---

yaml --- r: 128503 b: refs/heads/master c: b4a2a0e h: refs/heads/master i: 128501: 44df15f 128499: e5c99ac 128495: 93c8db5 v: v3
git-mirror · Sep 25, 2008 · 94f5f6e · 94f5f6e
1 parent 08a8b65
commit 94f5f6e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbf0d0062da2b3e1e239e381f8ac20971ef1b2ed
+refs/heads/master: b4a2a0edfda5a721bb4c5fa0068d2ad7ea67f98b
diff --git a/trunk/fs/btrfs/sysfs.c b/trunk/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);
 }