diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2018-05-10 15:44:48 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-05-28 18:07:34 +0200 |
| commit | 5296c2bf51700451062dda22cd03c01d0104ccbc (patch) | |
| tree | 38436e3b0823a0e1acf19d603a8bceb81e5e7cdf /fs/btrfs | |
| parent | 719fb4de5508f5fdf230ed4a76f6f830497a8f82 (diff) | |
| download | linux-stable-5296c2bf51700451062dda22cd03c01d0104ccbc.tar.gz linux-stable-5296c2bf51700451062dda22cd03c01d0104ccbc.tar.bz2 linux-stable-5296c2bf51700451062dda22cd03c01d0104ccbc.zip | |
btrfs: Remove fs_info parameter from convert_free_space_to_extents
This function always takes a transaction handle which contains a
reference to fs_info. So use that and kill the extra argument.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/free-space-tree.c | 5 | ||||
| -rw-r--r-- | fs/btrfs/free-space-tree.h | 1 | ||||
| -rw-r--r-- | fs/btrfs/tests/free-space-tree-tests.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c index 1dea35ac7139..3937a3baf2f5 100644 --- a/fs/btrfs/free-space-tree.c +++ b/fs/btrfs/free-space-tree.c @@ -316,10 +316,10 @@ out: } int convert_free_space_to_extents(struct btrfs_trans_handle *trans, - struct btrfs_fs_info *fs_info, struct btrfs_block_group_cache *block_group, struct btrfs_path *path) { + struct btrfs_fs_info *fs_info = trans->fs_info; struct btrfs_root *root = fs_info->free_space_root; struct btrfs_free_space_info *info; struct btrfs_key key, found_key; @@ -480,8 +480,7 @@ static int update_free_space_extent_count(struct btrfs_trans_handle *trans, ret = convert_free_space_to_bitmaps(trans, block_group, path); } else if ((flags & BTRFS_FREE_SPACE_USING_BITMAPS) && extent_count < block_group->bitmap_low_thresh) { - ret = convert_free_space_to_extents(trans, fs_info, block_group, - path); + ret = convert_free_space_to_extents(trans, block_group, path); } out: diff --git a/fs/btrfs/free-space-tree.h b/fs/btrfs/free-space-tree.h index 72ff743611ff..7624f2a1f8e7 100644 --- a/fs/btrfs/free-space-tree.h +++ b/fs/btrfs/free-space-tree.h @@ -46,7 +46,6 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans, struct btrfs_block_group_cache *block_group, struct btrfs_path *path); int convert_free_space_to_extents(struct btrfs_trans_handle *trans, - struct btrfs_fs_info *fs_info, struct btrfs_block_group_cache *block_group, struct btrfs_path *path); int free_space_test_bit(struct btrfs_block_group_cache *block_group, diff --git a/fs/btrfs/tests/free-space-tree-tests.c b/fs/btrfs/tests/free-space-tree-tests.c index d3983ae6173a..176ee997319c 100644 --- a/fs/btrfs/tests/free-space-tree-tests.c +++ b/fs/btrfs/tests/free-space-tree-tests.c @@ -131,7 +131,7 @@ static int check_free_space_extents(struct btrfs_trans_handle *trans, /* Flip it to the other format and check that for good measure. */ if (flags & BTRFS_FREE_SPACE_USING_BITMAPS) { - ret = convert_free_space_to_extents(trans, fs_info, cache, path); + ret = convert_free_space_to_extents(trans, cache, path); if (ret) { test_msg("Could not convert to extents\n"); return ret; |