From: Nikolay Borisov Date: Thu, 10 May 2018 12:44:52 +0000 (+0300) Subject: btrfs: Remove fs_info argument from remove_free_space_extent X-Git-Tag: v4.18-rc1~176^2~89 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e581168d1f56ae64e29bd715d34455980212f18d;p=linux.git btrfs: Remove fs_info argument from remove_free_space_extent This function takes a transaction handle which already has a reference to the fs_info. Use it and remove the extra argument. Signed-off-by: Nikolay Borisov Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c index 4d6f8cbb77d7..f0260cfcf7eb 100644 --- a/fs/btrfs/free-space-tree.c +++ b/fs/btrfs/free-space-tree.c @@ -690,12 +690,11 @@ static int modify_free_space_bitmap(struct btrfs_trans_handle *trans, } static int remove_free_space_extent(struct btrfs_trans_handle *trans, - struct btrfs_fs_info *fs_info, struct btrfs_block_group_cache *block_group, struct btrfs_path *path, u64 start, u64 size) { - struct btrfs_root *root = fs_info->free_space_root; + struct btrfs_root *root = trans->fs_info->free_space_root; struct btrfs_key key; u64 found_start, found_end; u64 end = start + size; @@ -801,8 +800,8 @@ int __remove_from_free_space_tree(struct btrfs_trans_handle *trans, return modify_free_space_bitmap(trans, block_group, path, start, size, 1); } else { - return remove_free_space_extent(trans, fs_info, block_group, - path, start, size); + return remove_free_space_extent(trans, block_group, path, + start, size); } }