Commit 69b0e093 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: let btrfs_return_cluster_to_free_space() return void 



__btrfs_return_cluster_to_free_space() returns only 0. And all its
parent functions don't need the return value either so make this a void
function.

Further, as none of the callers of btrfs_return_cluster_to_free_space()
is actually using the return from this function, make this function also
return void.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f22f457a

fs/btrfs/free-space-cache.c

+5 −9
Original line number Diff line number Diff line
@@ -2703,8 +2703,7 @@ void btrfs_init_free_space_ctl(struct btrfs_block_group *block_group) 
 * pointed to by the cluster, someone else raced in and freed the

 * cluster already.  In that case, we just return without changing anything

 */

static int

__btrfs_return_cluster_to_free_space(

static void __btrfs_return_cluster_to_free_space(

			     struct btrfs_block_group *block_group,

			     struct btrfs_free_cluster *cluster)

{
@@ -2756,7 +2755,6 @@ __btrfs_return_cluster_to_free_space( 
out:

	spin_unlock(&cluster->lock);

	btrfs_put_block_group(block_group);

	return 0;

}



static void __btrfs_remove_free_space_cache_locked(
@@ -2907,12 +2905,11 @@ u64 btrfs_find_space_for_alloc(struct btrfs_block_group *block_group, 
 * Otherwise, it'll get a reference on the block group pointed to by the

 * cluster and remove the cluster from it.

 */

int btrfs_return_cluster_to_free_space(

void btrfs_return_cluster_to_free_space(

			       struct btrfs_block_group *block_group,

			       struct btrfs_free_cluster *cluster)

{

	struct btrfs_free_space_ctl *ctl;

	int ret;



	/* first, get a safe pointer to the block group */

	spin_lock(&cluster->lock);
@@ -2920,12 +2917,12 @@ int btrfs_return_cluster_to_free_space( 
		block_group = cluster->block_group;

		if (!block_group) {

			spin_unlock(&cluster->lock);

			return 0;

			return;

		}

	} else if (cluster->block_group != block_group) {

		/* someone else has already freed it don't redo their work */

		spin_unlock(&cluster->lock);

		return 0;

		return;

	}

	atomic_inc(&block_group->count);

	spin_unlock(&cluster->lock);
@@ -2934,14 +2931,13 @@ int btrfs_return_cluster_to_free_space( 


	/* now return any extents the cluster had on it */

	spin_lock(&ctl->tree_lock);

	ret = __btrfs_return_cluster_to_free_space(block_group, cluster);

	__btrfs_return_cluster_to_free_space(block_group, cluster);

	spin_unlock(&ctl->tree_lock);



	btrfs_discard_queue_work(&block_group->fs_info->discard_ctl, block_group);



	/* finally drop our ref */

	btrfs_put_block_group(block_group);

	return ret;

}



static u64 btrfs_alloc_from_bitmap(struct btrfs_block_group *block_group,

fs/btrfs/free-space-cache.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ void btrfs_init_free_cluster(struct btrfs_free_cluster *cluster); 
u64 btrfs_alloc_from_cluster(struct btrfs_block_group *block_group,

			     struct btrfs_free_cluster *cluster, u64 bytes,

			     u64 min_start, u64 *max_extent_size);

int btrfs_return_cluster_to_free_space(

void btrfs_return_cluster_to_free_space(

			       struct btrfs_block_group *block_group,

			       struct btrfs_free_cluster *cluster);

int btrfs_trim_block_group(struct btrfs_block_group *block_group,