2020-10-20 11:45:30

by Kaixu Xia

[permalink] [raw]
Subject: [PATCH] ext4: remove redundant operation that set bh to NULL

From: Kaixu Xia <[email protected]>

The out_fail branch path don't release the bh and the second bh is
valid only in the for statement, so we don't need to set them to NULL.

Signed-off-by: Kaixu Xia <[email protected]>
---
fs/ext4/super.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 5308f0d5fb5a..3ebfabc6061a 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4093,7 +4093,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
if (IS_ERR(bh)) {
ext4_msg(sb, KERN_ERR, "unable to read superblock");
ret = PTR_ERR(bh);
- bh = NULL;
goto out_fail;
}
/*
@@ -4721,7 +4720,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
"can't read group descriptor %d", i);
db_count = i;
ret = PTR_ERR(bh);
- bh = NULL;
goto failed_mount2;
}
rcu_read_lock();
--
2.20.0


2020-10-21 11:57:35

by Zhang Yi

[permalink] [raw]
Subject: Re: [PATCH] ext4: remove redundant operation that set bh to NULL

On 2020/10/20 19:41, [email protected] wrote:
> From: Kaixu Xia <[email protected]>
>
> The out_fail branch path don't release the bh and the second bh is
> valid only in the for statement, so we don't need to set them to NULL.
>
> Signed-off-by: Kaixu Xia <[email protected]>

Thanks for the patch. It looks good to me.
Reviewed-by: zhangyi (F) <[email protected]>

Yi.

> ---
> fs/ext4/super.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 5308f0d5fb5a..3ebfabc6061a 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -4093,7 +4093,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
> if (IS_ERR(bh)) {
> ext4_msg(sb, KERN_ERR, "unable to read superblock");
> ret = PTR_ERR(bh);
> - bh = NULL;
> goto out_fail;
> }
> /*
> @@ -4721,7 +4720,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
> "can't read group descriptor %d", i);
> db_count = i;
> ret = PTR_ERR(bh);
> - bh = NULL;
> goto failed_mount2;
> }
> rcu_read_lock();
>

2020-12-03 14:18:47

by Theodore Ts'o

[permalink] [raw]
Subject: Re: [PATCH] ext4: remove redundant operation that set bh to NULL

On Wed, Oct 21, 2020 at 09:10:18AM +0800, zhangyi (F) wrote:
> On 2020/10/20 19:41, [email protected] wrote:
> > From: Kaixu Xia <[email protected]>
> >
> > The out_fail branch path don't release the bh and the second bh is
> > valid only in the for statement, so we don't need to set them to NULL.
> >
> > Signed-off-by: Kaixu Xia <[email protected]>
>
> Thanks for the patch. It looks good to me.
> Reviewed-by: zhangyi (F) <[email protected]>

Applied, thanks.

- Ted