Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Filipe Manana and committed by
David Sterba
771af6ff 7fc35cc5

+5 -7
+2 -2
fs/btrfs/space-info.c
··· 274 274 sub_group->parent = parent; 275 275 sub_group->subgroup_id = id; 276 276 277 - ret = btrfs_sysfs_add_space_info_type(fs_info, sub_group); 277 + ret = btrfs_sysfs_add_space_info_type(sub_group); 278 278 if (ret) { 279 279 kfree(sub_group); 280 280 parent->sub_group[index] = NULL; ··· 308 308 return ret; 309 309 } 310 310 311 - ret = btrfs_sysfs_add_space_info_type(info, space_info); 311 + ret = btrfs_sysfs_add_space_info_type(space_info); 312 312 if (ret) 313 313 return ret; 314 314
+2 -3
fs/btrfs/sysfs.c
··· 1981 1981 * Create a sysfs entry for a space info type at path 1982 1982 * /sys/fs/btrfs/UUID/allocation/TYPE 1983 1983 */ 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) 1986 1985 { 1987 1986 int ret; 1988 1987 1989 1988 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", 1991 1990 alloc_name(space_info)); 1992 1991 if (ret) { 1993 1992 kobject_put(&space_info->kobj);
+1 -2
fs/btrfs/sysfs.h
··· 37 37 int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info); 38 38 void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info); 39 39 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); 42 41 void btrfs_sysfs_remove_space_info(struct btrfs_space_info *space_info); 43 42 void btrfs_sysfs_update_devid(struct btrfs_device *device); 44 43