Re: [PATCH 2/6] btrfs: add helper function free_bitmap()

[Josef Bacik <josef@redhat.com>]

On Mon, Aug 23, 2010 at 09:23:01AM +0800, Li Zefan wrote:
> Remove some duplicated code.
> 
> This prepares for the next patch.
> 
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
> ---
>  fs/btrfs/free-space-cache.c |   37 ++++++++++++++++---------------------
>  1 files changed, 16 insertions(+), 21 deletions(-)
> 
> diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
> index 7edbef6..017fd55 100644
> --- a/fs/btrfs/free-space-cache.c
> +++ b/fs/btrfs/free-space-cache.c
> @@ -422,6 +422,16 @@ static void add_new_bitmap(struct btrfs_block_group_cache *block_group,
>  	recalculate_thresholds(block_group);
>  }
>  
> +static void free_bitmap(struct btrfs_block_group_cache *block_group,
> +			struct btrfs_free_space *bitmap_info)
> +{
> +	unlink_free_space(block_group, bitmap_info);
> +	kfree(bitmap_info->bitmap);
> +	kfree(bitmap_info);
> +	block_group->total_bitmaps--;
> +	recalculate_thresholds(block_group);
> +}
> +
>  static noinline int remove_from_bitmap(struct btrfs_block_group_cache *block_group,
>  			      struct btrfs_free_space *bitmap_info,
>  			      u64 *offset, u64 *bytes)
> @@ -462,13 +472,8 @@ again:
>  
>  	if (*bytes) {
>  		struct rb_node *next = rb_next(&bitmap_info->offset_index);
> -		if (!bitmap_info->bytes) {
> -			unlink_free_space(block_group, bitmap_info);
> -			kfree(bitmap_info->bitmap);
> -			kfree(bitmap_info);
> -			block_group->total_bitmaps--;
> -			recalculate_thresholds(block_group);
> -		}
> +		if (!bitmap_info->bytes)
> +			free_bitmap(block_group, bitmap_info);
>  
>  		/*
>  		 * no entry after this bitmap, but we still have bytes to
> @@ -501,13 +506,8 @@ again:
>  			return -EAGAIN;
>  
>  		goto again;
> -	} else if (!bitmap_info->bytes) {
> -		unlink_free_space(block_group, bitmap_info);
> -		kfree(bitmap_info->bitmap);
> -		kfree(bitmap_info);
> -		block_group->total_bitmaps--;
> -		recalculate_thresholds(block_group);
> -	}
> +	} else if (!bitmap_info->bytes)
> +		free_bitmap(block_group, bitmap_info);
>  
>  	return 0;
>  }
> @@ -936,13 +936,8 @@ u64 btrfs_find_space_for_alloc(struct btrfs_block_group_cache *block_group,
>  	ret = offset;
>  	if (entry->bitmap) {
>  		bitmap_clear_bits(block_group, entry, offset, bytes);
> -		if (!entry->bytes) {
> -			unlink_free_space(block_group, entry);
> -			kfree(entry->bitmap);
> -			kfree(entry);
> -			block_group->total_bitmaps--;
> -			recalculate_thresholds(block_group);
> -		}
> +		if (!entry->bytes)
> +			free_bitmap(block_group, entry);
>  	} else {
>  		unlink_free_space(block_group, entry);
>  		entry->offset += bytes;
> -- 
> 1.7.0.1
> 

Reviewed-by: Josef Bacik <josef@redhat.com>

Thanks,

Josef