Commit b1c8f527 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: open code trivial btrfs_add_excluded_extent() 



The code for btrfs_add_excluded_extent() is trivial, it's just a
set_extent_bit() call. However it's defined in extent-tree.c but it is
only used (twice) in block-group.c. So open code it in block-group.c,
reducing the need to export a trivial function.

Also since the only caller btrfs_add_excluded_extent() is prepared to
deal with errors, stop ignoring errors from the set_extent_bit() call.

Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e5860f82

fs/btrfs/block-group.c

+6 −4
Original line number Diff line number Diff line
@@ -2104,8 +2104,9 @@ static int exclude_super_stripes(struct btrfs_block_group *cache) 
	if (cache->start < BTRFS_SUPER_INFO_OFFSET) {

		stripe_len = BTRFS_SUPER_INFO_OFFSET - cache->start;

		cache->bytes_super += stripe_len;

		ret = btrfs_add_excluded_extent(fs_info, cache->start,

						stripe_len);

		ret = set_extent_bit(&fs_info->excluded_extents, cache->start,

				     cache->start + stripe_len - 1,

				     EXTENT_UPTODATE, NULL);

		if (ret)

			return ret;

	}
@@ -2131,8 +2132,9 @@ static int exclude_super_stripes(struct btrfs_block_group *cache) 
				cache->start + cache->length - logical[nr]);



			cache->bytes_super += len;

			ret = btrfs_add_excluded_extent(fs_info, logical[nr],

							len);

			ret = set_extent_bit(&fs_info->excluded_extents, logical[nr],

					     logical[nr] + len - 1,

					     EXTENT_UPTODATE, NULL);

			if (ret) {

				kfree(logical);

				return ret;

fs/btrfs/extent-tree.c

+0 −9
Original line number Diff line number Diff line
@@ -69,15 +69,6 @@ static int block_group_bits(struct btrfs_block_group *cache, u64 bits) 
	return (cache->flags & bits) == bits;

}



int btrfs_add_excluded_extent(struct btrfs_fs_info *fs_info,

			      u64 start, u64 num_bytes)

{

	u64 end = start + num_bytes - 1;

	set_extent_bit(&fs_info->excluded_extents, start, end,

		       EXTENT_UPTODATE, NULL);

	return 0;

}



void btrfs_free_excluded_extents(struct btrfs_block_group *cache)

{

	struct btrfs_fs_info *fs_info = cache->fs_info;

fs/btrfs/extent-tree.h

+0 −2
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ int btrfs_get_extent_inline_ref_type(const struct extent_buffer *eb, 
				     enum btrfs_inline_ref_type is_data);

u64 hash_extent_data_ref(u64 root_objectid, u64 owner, u64 offset);



int btrfs_add_excluded_extent(struct btrfs_fs_info *fs_info,

			      u64 start, u64 num_bytes);

void btrfs_free_excluded_extents(struct btrfs_block_group *cache);

int btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, unsigned long count);

void btrfs_cleanup_ref_head_accounting(struct btrfs_fs_info *fs_info,