From 94f5f6e25e8e69f18d3c70f52a796b1b8f1a2327 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 19 Oct 2007 09:23:08 -0400
Subject: [PATCH] --- yaml --- r: 128503 b: refs/heads/master c:
 b4a2a0edfda5a721bb4c5fa0068d2ad7ea67f98b h: refs/heads/master i:   128501:
 44df15f1becba2c2250256d92a60cd63704006f0   128499:
 e5c99ac52310a0ea7ac0b8f7abf4f9818e9a61a3   128495:
 93c8db5fc5e99b4c4a21a68dc3b2127bae9c7b5e v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/sysfs.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 27a3c5ba875a..73974f7b3da7 100644
--- 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
index 0bd1fd3d29df..1671c731800e 100644
--- 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);
 }