3 files changed, 36 insertions, 16 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 02895a126ab9..af523d695432 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1123,6 +1123,12 @@ struct btrfs_qgroup_limit_item {
         __le64 rsv_excl;
 } __attribute__ ((__packed__));
 
+/* For raid type sysfs entries */
+struct raid_kobject {
+        int raid_type;
+        struct kobject kobj;
+};
+
 struct btrfs_space_info {
         spinlock_t lock;
 
@@ -1173,7 +1179,7 @@ struct btrfs_space_info {
         wait_queue_head_t wait;
 
         struct kobject kobj;
-        struct kobject block_group_kobjs[BTRFS_NR_RAID_TYPES];
+        struct kobject *block_group_kobjs[BTRFS_NR_RAID_TYPES];
 };
 
 #define BTRFS_BLOCK_RSV_GLOBAL          1
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 6caddd5970e4..fafb3e53ecde 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3497,10 +3497,8 @@ static int update_space_info(struct btrfs_fs_info *info, u64 flags,
                 return ret;
         }
 
-        for (i = 0; i < BTRFS_NR_RAID_TYPES; i++) {
+        for (i = 0; i < BTRFS_NR_RAID_TYPES; i++)
                 INIT_LIST_HEAD(&found->block_groups[i]);
-                kobject_init(&found->block_group_kobjs[i], &btrfs_raid_ktype);
-        }
         init_rwsem(&found->groups_sem);
         spin_lock_init(&found->lock);
         found->flags = flags & BTRFS_BLOCK_GROUP_TYPE_MASK;
@@ -8586,8 +8584,9 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
                 list_del(&space_info->list);
                 for (i = 0; i < BTRFS_NR_RAID_TYPES; i++) {
                         struct kobject *kobj;
-                        kobj = &space_info->block_group_kobjs[i];
-                        if (kobj->parent) {
+                        kobj = space_info->block_group_kobjs[i];
+                        space_info->block_group_kobjs[i] = NULL;
+                        if (kobj) {
                                 kobject_del(kobj);
                                 kobject_put(kobj);
                         }
@@ -8611,17 +8610,26 @@ static void __link_block_group(struct btrfs_space_info *space_info,
         up_write(&space_info->groups_sem);
 
         if (first) {
-                struct kobject *kobj = &space_info->block_group_kobjs[index];
+                struct raid_kobject *rkobj;
                 int ret;
 
-                kobject_get(&space_info->kobj); /* put in release */
-                ret = kobject_add(kobj, &space_info->kobj, "%s",
-                                  get_raid_name(index));
+                rkobj = kzalloc(sizeof(*rkobj), GFP_NOFS);
+                if (!rkobj)
+                        goto out_err;
+                rkobj->raid_type = index;
+                kobject_init(&rkobj->kobj, &btrfs_raid_ktype);
+                ret = kobject_add(&rkobj->kobj, &space_info->kobj,
+                                  "%s", get_raid_name(index));
                 if (ret) {
-                        pr_warn("BTRFS: failed to add kobject for block cache. ignoring.\n");
-                        kobject_put(&space_info->kobj);
+                        kobject_put(&rkobj->kobj);
+                        goto out_err;
                 }
+                space_info->block_group_kobjs[index] = &rkobj->kobj;
         }
+
+        return;
+out_err:
+        pr_warn("BTRFS: failed to add kobject for block cache. ignoring.\n");
 }
 
 static struct btrfs_block_group_cache *
@@ -8956,6 +8964,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
         struct btrfs_root *tree_root = root->fs_info->tree_root;
         struct btrfs_key key;
         struct inode *inode;
+        struct kobject *kobj = NULL;
         int ret;
         int index;
         int factor;
@@ -9055,11 +9064,15 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
          */
         list_del_init(&block_group->list);
         if (list_empty(&block_group->space_info->block_groups[index])) {
-                kobject_del(&block_group->space_info->block_group_kobjs[index]);
-                kobject_put(&block_group->space_info->block_group_kobjs[index]);
+                kobj = block_group->space_info->block_group_kobjs[index];
+                block_group->space_info->block_group_kobjs[index] = NULL;
                 clear_avail_alloc_bits(root->fs_info, block_group->flags);
         }
         up_write(&block_group->space_info->groups_sem);
+        if (kobj) {
+                kobject_del(kobj);
+                kobject_put(kobj);
+        }
 
         if (block_group->cached == BTRFS_CACHE_STARTED)
                 wait_block_group_cache_done(block_group);
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index c0dfda5644f2..df39458f1487 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -254,6 +254,7 @@ static ssize_t global_rsv_reserved_show(struct kobject *kobj,
 BTRFS_ATTR(global_rsv_reserved, 0444, global_rsv_reserved_show);
 
 #define to_space_info(_kobj) container_of(_kobj, struct btrfs_space_info, kobj)
+#define to_raid_kobj(_kobj) container_of(_kobj, struct raid_kobject, kobj)
 
 static ssize_t raid_bytes_show(struct kobject *kobj,
                                struct kobj_attribute *attr, char *buf);
@@ -266,7 +267,7 @@ static ssize_t raid_bytes_show(struct kobject *kobj,
 {
         struct btrfs_space_info *sinfo = to_space_info(kobj->parent);
         struct btrfs_block_group_cache *block_group;
-        int index = kobj - sinfo->block_group_kobjs;
+        int index = to_raid_kobj(kobj)->raid_type;
         u64 val = 0;
 
         down_read(&sinfo->groups_sem);
@@ -288,7 +289,7 @@ static struct attribute *raid_attributes[] = {
 
 static void release_raid_kobj(struct kobject *kobj)
 {
-        kobject_put(kobj->parent);
+        kfree(to_raid_kobj(kobj));
 }
 
 struct kobj_type btrfs_raid_ktype = {