2021-08-25 06:28:19

by CGEL

Subject: [PATCH linux-next] fs:disk-io: emove unneeded variable

From: Jing Yangyang <[email protected]>

Eliminate the following coccicheck warning:
./fs/btrfs/disk-io.c:4630: 5-8:
Unneeded variable "ret". Return "0" on line 4638

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Jing Yangyang <[email protected]>
---
fs/btrfs/disk-io.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index a66e2cb..e531c4c 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4627,7 +4627,6 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
struct rb_node *node;
struct btrfs_delayed_ref_root *delayed_refs;
struct btrfs_delayed_ref_node *ref;
- int ret = 0;

delayed_refs = &trans->delayed_refs;

@@ -4635,7 +4634,7 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
if (atomic_read(&delayed_refs->num_entries) == 0) {
spin_unlock(&delayed_refs->lock);
btrfs_debug(fs_info, "delayed_refs has NO entry");
- return ret;
+ return 0;
}

while ((node = rb_first_cached(&delayed_refs->href_root)) != NULL) {
@@ -4698,7 +4697,7 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,

spin_unlock(&delayed_refs->lock);

- return ret;
+ return 0;
}

static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root)
--
1.8.3.1

2021-08-25 06:40:29

by Qu Wenruo

Subject: Re: [PATCH linux-next] fs:disk-io: emove unneeded variable

On 2021/8/25 下午2:27, CGEL wrote:
> From: Jing Yangyang <[email protected]>
>
> Eliminate the following coccicheck warning:
> ./fs/btrfs/disk-io.c:4630: 5-8:
> Unneeded variable "ret". Return "0" on line 4638
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Jing Yangyang <[email protected]>

There is a big BUG_ON() in the code, indicating missing error handling.

Ignoring it and just removing the @ret is never a real fix, please add
proper error handling first.

Thanks,
Qu
> ---
> fs/btrfs/disk-io.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index a66e2cb..e531c4c 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -4627,7 +4627,6 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
> struct rb_node *node;
> struct btrfs_delayed_ref_root *delayed_refs;
> struct btrfs_delayed_ref_node *ref;
> - int ret = 0;
>
> delayed_refs = &trans->delayed_refs;
>
> @@ -4635,7 +4634,7 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
> if (atomic_read(&delayed_refs->num_entries) == 0) {
> spin_unlock(&delayed_refs->lock);
> btrfs_debug(fs_info, "delayed_refs has NO entry");
> - return ret;
> + return 0;
> }
>
> while ((node = rb_first_cached(&delayed_refs->href_root)) != NULL) {
> @@ -4698,7 +4697,7 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
>
> spin_unlock(&delayed_refs->lock);
>
> - return ret;
> + return 0;
> }
>
> static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root)
>