btrfs: remove fs_info argument from btrfs_sysfs_add_space_info_type()

We don't need it since we can grab fs_info from the given space_info.
So remove the fs_info argument.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 9ced89678953347ea77c79ea4c83701600f2f97a..69237f5d6078c01ff79d4a63cd222c7a0ddfe40e 100644 (file)
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -274,7 +274,7 @@ static int create_space_info_sub_group(struct btrfs_space_info *parent, u64 flag
        sub_group->parent = parent;
        sub_group->subgroup_id = id;
 
-       ret = btrfs_sysfs_add_space_info_type(fs_info, sub_group);
+       ret = btrfs_sysfs_add_space_info_type(sub_group);
        if (ret) {
                kfree(sub_group);
                parent->sub_group[index] = NULL;
@@ -308,7 +308,7 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags)
                        return ret;
        }
 
-       ret = btrfs_sysfs_add_space_info_type(info, space_info);
+       ret = btrfs_sysfs_add_space_info_type(space_info);
        if (ret)
                return ret;
 

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 81f52c1f55ce57f8d090e5b96436c747b8dba27a..d66681ce2b3da5cffd429ecba15eb1bbd686b6fc 100644 (file)
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -1981,13 +1981,12 @@ static const char *alloc_name(struct btrfs_space_info *space_info)
  * Create a sysfs entry for a space info type at path
  * /sys/fs/btrfs/UUID/allocation/TYPE
  */
-int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,
-                                   struct btrfs_space_info *space_info)
+int btrfs_sysfs_add_space_info_type(struct btrfs_space_info *space_info)
 {
        int ret;
 
        ret = kobject_init_and_add(&space_info->kobj, &space_info_ktype,
-                                  fs_info->space_info_kobj, "%s",
+                                  space_info->fs_info->space_info_kobj, "%s",
                                   alloc_name(space_info));
        if (ret) {
                kobject_put(&space_info->kobj);

diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h
index 0f94ae9232101b50ace44c9886feac97805dcfcf..05498e5346c395bd7f6c278ac241905cc8e39967 100644 (file)
--- a/fs/btrfs/sysfs.h
+++ b/fs/btrfs/sysfs.h
@@ -37,8 +37,7 @@ void __cold btrfs_exit_sysfs(void);
 int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info);
 void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info);
 void btrfs_sysfs_add_block_group_type(struct btrfs_block_group *cache);
-int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,
-                                   struct btrfs_space_info *space_info);
+int btrfs_sysfs_add_space_info_type(struct btrfs_space_info *space_info);
 void btrfs_sysfs_remove_space_info(struct btrfs_space_info *space_info);
 void btrfs_sysfs_update_devid(struct btrfs_device *device);