Skip to content

Commit a6c12d4

Browse files
fdmananakdave
authored andcommitted
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> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 00c63c9 commit a6c12d4

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

fs/btrfs/space-info.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ static int create_space_info_sub_group(struct btrfs_space_info *parent, u64 flag
274274
sub_group->parent = parent;
275275
sub_group->subgroup_id = id;
276276

277-
ret = btrfs_sysfs_add_space_info_type(fs_info, sub_group);
277+
ret = btrfs_sysfs_add_space_info_type(sub_group);
278278
if (ret) {
279279
kfree(sub_group);
280280
parent->sub_group[index] = NULL;
@@ -308,7 +308,7 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags)
308308
return ret;
309309
}
310310

311-
ret = btrfs_sysfs_add_space_info_type(info, space_info);
311+
ret = btrfs_sysfs_add_space_info_type(space_info);
312312
if (ret)
313313
return ret;
314314

fs/btrfs/sysfs.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,13 +1981,12 @@ static const char *alloc_name(struct btrfs_space_info *space_info)
19811981
* Create a sysfs entry for a space info type at path
19821982
* /sys/fs/btrfs/UUID/allocation/TYPE
19831983
*/
1984-
int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,
1985-
struct btrfs_space_info *space_info)
1984+
int btrfs_sysfs_add_space_info_type(struct btrfs_space_info *space_info)
19861985
{
19871986
int ret;
19881987

19891988
ret = kobject_init_and_add(&space_info->kobj, &space_info_ktype,
1990-
fs_info->space_info_kobj, "%s",
1989+
space_info->fs_info->space_info_kobj, "%s",
19911990
alloc_name(space_info));
19921991
if (ret) {
19931992
kobject_put(&space_info->kobj);

fs/btrfs/sysfs.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ void __cold btrfs_exit_sysfs(void);
3737
int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info);
3838
void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info);
3939
void btrfs_sysfs_add_block_group_type(struct btrfs_block_group *cache);
40-
int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,
41-
struct btrfs_space_info *space_info);
40+
int btrfs_sysfs_add_space_info_type(struct btrfs_space_info *space_info);
4241
void btrfs_sysfs_remove_space_info(struct btrfs_space_info *space_info);
4342
void btrfs_sysfs_update_devid(struct btrfs_device *device);
4443

0 commit comments

Comments
 (0)