leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: let btrfs_return_cluster_to_free_space() return void

Browse Source 
__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: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2020-06-03 18:10:18 +08:00 committed by David Sterba
parent f22f457a1a
commit 69b0e093c7
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/btrfs/free-space-cache.c
View File

@ -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 * pointed to by the cluster, someone else raced in and freed the
* cluster already. In that case, we just return without changing anything * cluster already. In that case, we just return without changing anything
*/ */
static int static void __btrfs_return_cluster_to_free_space(
__btrfs_return_cluster_to_free_space(
struct btrfs_block_group *block_group, struct btrfs_block_group *block_group,
struct btrfs_free_cluster *cluster) struct btrfs_free_cluster *cluster)
{ {
@ -2756,7 +2755,6 @@ __btrfs_return_cluster_to_free_space(
out: out:
spin_unlock(&cluster->lock); spin_unlock(&cluster->lock);
btrfs_put_block_group(block_group); btrfs_put_block_group(block_group);
return 0;
} }
static void __btrfs_remove_free_space_cache_locked( static void __btrfs_remove_free_space_cache_locked(
@ -2907,12 +2905,11 @@ out:
* Otherwise, it'll get a reference on the block group pointed to by the * Otherwise, it'll get a reference on the block group pointed to by the
* cluster and remove the cluster from it. * 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_block_group *block_group,
struct btrfs_free_cluster *cluster) struct btrfs_free_cluster *cluster)
{ {
struct btrfs_free_space_ctl *ctl; struct btrfs_free_space_ctl *ctl;
int ret;
/* first, get a safe pointer to the block group */ /* first, get a safe pointer to the block group */
spin_lock(&cluster->lock); spin_lock(&cluster->lock);
@ -2920,12 +2917,12 @@ int btrfs_return_cluster_to_free_space(
block_group = cluster->block_group; block_group = cluster->block_group;
if (!block_group) { if (!block_group) {
spin_unlock(&cluster->lock); spin_unlock(&cluster->lock);
return 0; return;
} }
} else if (cluster->block_group != block_group) { } else if (cluster->block_group != block_group) {
/* someone else has already freed it don't redo their work */ /* someone else has already freed it don't redo their work */
spin_unlock(&cluster->lock); spin_unlock(&cluster->lock);
return 0; return;
} }
atomic_inc(&block_group->count); atomic_inc(&block_group->count);
spin_unlock(&cluster->lock); spin_unlock(&cluster->lock);
@ -2934,14 +2931,13 @@ int btrfs_return_cluster_to_free_space(
/* now return any extents the cluster had on it */ /* now return any extents the cluster had on it */
spin_lock(&ctl->tree_lock); 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); spin_unlock(&ctl->tree_lock);
btrfs_discard_queue_work(&block_group->fs_info->discard_ctl, block_group); btrfs_discard_queue_work(&block_group->fs_info->discard_ctl, block_group);
/* finally drop our ref */ /* finally drop our ref */
btrfs_put_block_group(block_group); btrfs_put_block_group(block_group);
return ret;
} }
static u64 btrfs_alloc_from_bitmap(struct btrfs_block_group *block_group, static u64 btrfs_alloc_from_bitmap(struct btrfs_block_group *block_group,

2
fs/btrfs/free-space-cache.h
View File

@ -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, u64 btrfs_alloc_from_cluster(struct btrfs_block_group *block_group,
struct btrfs_free_cluster *cluster, u64 bytes, struct btrfs_free_cluster *cluster, u64 bytes,
u64 min_start, u64 *max_extent_size); 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_block_group *block_group,
struct btrfs_free_cluster *cluster); struct btrfs_free_cluster *cluster);
int btrfs_trim_block_group(struct btrfs_block_group *block_group, int btrfs_trim_block_group(struct btrfs_block_group *block_group,