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

baomingtong001@208suo.com posted 1 patch 2 years, 7 months ago
fs/btrfs/extent_map.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
[PATCH] btrfs: remove unneeded variable from unpin_extent_cache()
Posted by baomingtong001@208suo.com 2 years, 7 months ago
fix the following coccicheck warning:

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

Signed-off-by: Mingtong Bao <baomingtong001@208suo.com>
---
  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;

  }
Re: [PATCH] btrfs: remove unneeded variable from unpin_extent_cache()
Posted by Qu Wenruo 2 years, 7 months ago

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

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;
>
>   }
Re: [PATCH] btrfs: remove unneeded variable from unpin_extent_cache()
Posted by Christoph Hellwig 2 years, 7 months ago
Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>