2023-06-14 07:14:36

by baomingtong001

Subject: [PATCH] btrfs: remove unneeded variable from unpin_extent_cache()

fix the following coccicheck warning:

fs/btrfs/extent_map.c:298:5-8: Unneeded variable: "ret". Return "0".

Signed-off-by: Mingtong Bao <[email protected]>
---
fs/btrfs/extent_map.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 0cdb3e86f29b..f3e9aaeb9956 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -295,7 +295,6 @@ static void try_merge_map(struct extent_map_tree
*tree, struct extent_map *em)
int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64
len,
u64 gen)
{
- int ret = 0;
struct extent_map *em;
bool prealloc = false;

@@ -327,7 +326,7 @@ int unpin_extent_cache(struct extent_map_tree *tree,
u64 start, u64 len,
free_extent_map(em);
out:
write_unlock(&tree->lock);
- return ret;
+ return 0;

}

2023-06-14 07:15:22

by Qu Wenruo

Subject: Re: [PATCH] btrfs: remove unneeded variable from unpin_extent_cache()

On 2023/6/14 14:59, [email protected] wrote:
> fix the following coccicheck warning:
>
> fs/btrfs/extent_map.c:298:5-8: Unneeded variable: "ret". Return "0".
>
> Signed-off-by: Mingtong Bao <[email protected]>

You can take it one step further by making the function return void.

Thanks,
Qu
> ---
>  fs/btrfs/extent_map.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
> index 0cdb3e86f29b..f3e9aaeb9956 100644
> --- a/fs/btrfs/extent_map.c
> +++ b/fs/btrfs/extent_map.c
> @@ -295,7 +295,6 @@ static void try_merge_map(struct extent_map_tree
> *tree, struct extent_map *em)
>  int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len,
>                 u64 gen)
>  {
> -    int ret = 0;
>      struct extent_map *em;
>      bool prealloc = false;
>
> @@ -327,7 +326,7 @@ int unpin_extent_cache(struct extent_map_tree *tree,
> u64 start, u64 len,
>      free_extent_map(em);
>  out:
>      write_unlock(&tree->lock);
> -    return ret;
> +    return 0;
>
>  }

2023-06-14 07:15:47

by Christoph Hellwig

Subject: Re: [PATCH] btrfs: remove unneeded variable from unpin_extent_cache()

Looks good:

Reviewed-by: Christoph Hellwig <[email protected]>