Commit 7ef54d54 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Open code __btrfs_free_reserved_extent in btrfs_free_reserved_extent 



__btrfs_free_reserved_extent performs 2 entirely different operations
depending on whether its 'pin' argument is true or false. This patch
lifts the 2nd case (pin is false) into it's sole caller
btrfs_free_reserved_extent. No semantics changes.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 4eaaec24

fs/btrfs/extent-tree.c

+15 −9
Original line number Diff line number Diff line
@@ -4179,14 +4179,7 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, 
		return -ENOSPC;

	}



	if (pin)

		pin_down_extent(cache, start, len, 1);

	else {

		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 ret;

}
@@ -4194,7 +4187,20 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, 
int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,

			       u64 start, u64 len, int delalloc)

{

	return __btrfs_free_reserved_extent(fs_info, start, len, 0, delalloc);

	struct btrfs_block_group *cache;



	cache = btrfs_lookup_block_group(fs_info, start);

	if (!cache) {

		btrfs_err(fs_info, "unable to find block group for %llu", start);

		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);



	btrfs_put_block_group(cache);

	return 0;

}



int btrfs_free_and_pin_reserved_extent(struct btrfs_fs_info *fs_info,

CRA Git | Maintained and supported by SUSTech CRA and CCSE