2021-10-08 00:31:15

by Colin King

Subject: [PATCH] btrfs: Remove redundant assignment of variable ret

From: Colin Ian King <[email protected]>

The variable ret is being assigned a value that is never read, it is
updated later on with a different value. The assignment is redundant and
can be removed.

Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <[email protected]>
---
fs/btrfs/free-space-cache.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index 8ea04582e34b..2a6d02971357 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -735,8 +735,6 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
return 0;
}

- ret = -1;
-
leaf = path->nodes[0];
header = btrfs_item_ptr(leaf, path->slots[0],
struct btrfs_free_space_header);
--
2.32.0

2021-10-08 01:11:35

by Anand Jain

Subject: Re: [PATCH] btrfs: Remove redundant assignment of variable ret

On 08/10/2021 07:27, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> The variable ret is being assigned a value that is never read, it is
> updated later on with a different value. The assignment is redundant and
> can be removed.
>
> Addresses-Coverity: ("Unused value")
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> fs/btrfs/free-space-cache.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
> index 8ea04582e34b..2a6d02971357 100644
> --- a/fs/btrfs/free-space-cache.c
> +++ b/fs/btrfs/free-space-cache.c
> @@ -735,8 +735,6 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
> return 0;
> }
>
> - ret = -1;
> -

Essentially we had goto out; when the inode generation check failed few
lines below. However, the commit a67509c30079 (Btrfs: add an io_ctl
struct and helpers for dealing with the space cache) replaced it with
return 0; and then ret = -1 did not make any sense.

Reviewed-by: Anand Jain <[email protected]>

Thanks, Anand

> leaf = path->nodes[0];
> header = btrfs_item_ptr(leaf, path->slots[0],
> struct btrfs_free_space_header);
>