[PATCH 09/13] btrfs: factor out sysfs code for deleting block group and space infos

[David Sterba]

The helpers to create block group and space info directories already
live in sysfs.c, move the deletion part there too.

Signed-off-by: David Sterba <dste...@suse.com>
---
 fs/btrfs/extent-tree.c | 14 +-------------
 fs/btrfs/sysfs.c       | 22 ++++++++++++++++++++++
 fs/btrfs/sysfs.h       |  1 +
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 8ac496fddc59..3a711f5e7919 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -7744,8 +7744,6 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
        btrfs_release_global_block_rsv(info);
 
        while (!list_empty(&info->space_info)) {
-               int i;
-
                space_info = list_entry(info->space_info.next,
                                        struct btrfs_space_info,
                                        list);
@@ -7759,17 +7757,7 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
                            space_info->bytes_may_use > 0))
                        btrfs_dump_space_info(info, space_info, 0, 0);
                list_del(&space_info->list);
-               for (i = 0; i < BTRFS_NR_RAID_TYPES; i++) {
-                       struct kobject *kobj;
-                       kobj = space_info->block_group_kobjs[i];
-                       space_info->block_group_kobjs[i] = NULL;
-                       if (kobj) {
-                               kobject_del(kobj);
-                               kobject_put(kobj);
-                       }
-               }
-               kobject_del(&space_info->kobj);
-               kobject_put(&space_info->kobj);
+               btrfs_sysfs_remove_space_info(space_info);
        }
        return 0;
 }
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 0f7e97ceec4e..2490144863ae 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -789,6 +789,28 @@ void btrfs_sysfs_add_block_group_type(struct 
btrfs_block_group_cache *cache)
        space_info->block_group_kobjs[index] = &rkobj->kobj;
 }
 
+/*
+ * Remove sysfs directories for all block group types of a given space info and
+ * the space info as well
+ */
+void btrfs_sysfs_remove_space_info(struct btrfs_space_info *space_info)
+{
+       int i;
+
+       for (i = 0; i < BTRFS_NR_RAID_TYPES; i++) {
+               struct kobject *kobj;
+
+               kobj = space_info->block_group_kobjs[i];
+               space_info->block_group_kobjs[i] = NULL;
+               if (kobj) {
+                       kobject_del(kobj);
+                       kobject_put(kobj);
+               }
+       }
+       kobject_del(&space_info->kobj);
+       kobject_put(&space_info->kobj);
+}
+
 static const char *alloc_name(u64 flags)
 {
        switch (flags) {
diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h
index 371fa9db5bbd..857710e77775 100644
--- a/fs/btrfs/sysfs.h
+++ b/fs/btrfs/sysfs.h
@@ -105,5 +105,6 @@ void btrfs_add_raid_kobjects(struct btrfs_fs_info *fs_info);
 void btrfs_sysfs_add_block_group_type(struct btrfs_block_group_cache *cache);
 int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,
                                    struct btrfs_space_info *space_info);
+void btrfs_sysfs_remove_space_info(struct btrfs_space_info *space_info);
 
 #endif
-- 
2.22.0