2021-11-12 02:50:01

by CGEL

Subject: [PATCH] fs:btrfs: remove unneeded variable

From: chiminghao <[email protected]>

Fix the following coccicheck REVIEW:
./fs/btrfs/extent_map.c:299:5-8 REVIEW Unneeded variable

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: chiminghao <[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 5a36add21305..1dcb5486ccb6 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -296,7 +296,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;

@@ -328,7 +327,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;

}

--
2.25.1

2021-11-12 03:12:34

by Qu Wenruo

Subject: Re: [PATCH] fs:btrfs: remove unneeded variable

On 2021/11/12 10:49, [email protected] wrote:
> From: chiminghao <[email protected]>
>
> Fix the following coccicheck REVIEW:
> ./fs/btrfs/extent_map.c:299:5-8 REVIEW Unneeded variable
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: chiminghao <[email protected]>

IIRC the @ret is reserved there as we're not handling the !em case with
error number, nor is the only caller properly handling the possible error.

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 5a36add21305..1dcb5486ccb6 100644
> --- a/fs/btrfs/extent_map.c
> +++ b/fs/btrfs/extent_map.c
> @@ -296,7 +296,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;
>
> @@ -328,7 +327,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;
>
> }
>
>