superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/1354/merge
Filipe Manana 2025-10-14 19:18:17 +01:00 committed by David Sterba
parent 7fc35cc559
commit 771af6ff72
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/space-info.c
View File

@ -274,7 +274,7 @@ static int create_space_info_sub_group(struct btrfs_space_info *parent, u64 flag
sub_group->parent = parent; sub_group->parent = parent;
sub_group->subgroup_id = id; 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) { if (ret) {
kfree(sub_group); kfree(sub_group);
parent->sub_group[index] = NULL; parent->sub_group[index] = NULL;
@ -308,7 +308,7 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags)
return ret; return ret;
} }
ret = btrfs_sysfs_add_space_info_type(info, space_info); ret = btrfs_sysfs_add_space_info_type(space_info);
if (ret) if (ret)
return ret; return ret;

5
fs/btrfs/sysfs.c
View File

@ -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 * Create a sysfs entry for a space info type at path
* /sys/fs/btrfs/UUID/allocation/TYPE * /sys/fs/btrfs/UUID/allocation/TYPE
*/ */
int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info, int btrfs_sysfs_add_space_info_type(struct btrfs_space_info *space_info)
struct btrfs_space_info *space_info)
{ {
int ret; int ret;
ret = kobject_init_and_add(&space_info->kobj, &space_info_ktype, 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)); alloc_name(space_info));
if (ret) { if (ret) {
kobject_put(&space_info->kobj); kobject_put(&space_info->kobj);

3
fs/btrfs/sysfs.h
View File

@ -37,8 +37,7 @@ void __cold btrfs_exit_sysfs(void);
int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info); 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_remove_mounted(struct btrfs_fs_info *fs_info);
void btrfs_sysfs_add_block_group_type(struct btrfs_block_group *cache); 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, int btrfs_sysfs_add_space_info_type(struct btrfs_space_info *space_info);
struct btrfs_space_info *space_info);
void btrfs_sysfs_remove_space_info(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); void btrfs_sysfs_update_devid(struct btrfs_device *device);