diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2019-11-21 13:03:31 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-01-20 16:40:51 +0100 |
| commit | a0fbf736d35efcddbfaacddd88aa4ca61c1668c3 (patch) | |
| tree | ca94cb5e0fc97f36e517ee50b66684cd5a570dd6 /fs/btrfs/extent-tree.c | |
| parent | btrfs: Open code __btrfs_free_reserved_extent in btrfs_free_reserved_extent (diff) | |
| download | linux-a0fbf736d35efcddbfaacddd88aa4ca61c1668c3.tar.xz linux-a0fbf736d35efcddbfaacddd88aa4ca61c1668c3.zip | |
btrfs: Rename __btrfs_free_reserved_extent to btrfs_pin_reserved_extent
__btrfs_free_reserved_extent now performs the actions of
btrfs_free_and_pin_reserved_extent. But this name is a bit of a
misnomer, since the extent is not really freed but just pinned. Reflect
this in the new name. No semantics changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 215dceaacaea..2a7dff22c3b7 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -4165,12 +4165,10 @@ again: return ret; } -static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, - u64 start, u64 len, - int pin, int delalloc) +int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, + u64 start, u64 len, int delalloc) { struct btrfs_block_group *cache; - int ret = 0; cache = btrfs_lookup_block_group(fs_info, start); if (!cache) { @@ -4179,15 +4177,18 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, return -ENOSPC; } - ret = pin_down_extent(cache, start, len, 1); + btrfs_add_free_space(cache, start, len); + btrfs_free_reserved_bytes(cache, len, delalloc); + trace_btrfs_reserved_extent_free(fs_info, start, len); + btrfs_put_block_group(cache); - return ret; + return 0; } -int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, - u64 start, u64 len, int delalloc) +int btrfs_pin_reserved_extent(struct btrfs_fs_info *fs_info, u64 start, u64 len) { struct btrfs_block_group *cache; + int ret = 0; cache = btrfs_lookup_block_group(fs_info, start); if (!cache) { @@ -4195,18 +4196,9 @@ int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, return -ENOSPC; } - btrfs_add_free_space(cache, start, len); - btrfs_free_reserved_bytes(cache, len, delalloc); - trace_btrfs_reserved_extent_free(fs_info, start, len); - + ret = pin_down_extent(cache, start, len, 1); btrfs_put_block_group(cache); - return 0; -} - -int btrfs_free_and_pin_reserved_extent(struct btrfs_fs_info *fs_info, - u64 start, u64 len) -{ - return __btrfs_free_reserved_extent(fs_info, start, len, 1, 0); + return ret; } static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans, |