2021-11-16 02:07:10

by Adam Borowski

[permalink] [raw]
Subject: [PATCH] ext4: drop an always true check

EXT_FIRST_INDEX(ptr) is ptr+12, which can't possibly be null; gcc-12
warns about this.

Signed-off-by: Adam Borowski <[email protected]>
---
fs/ext4/extents.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 0ecf819bf189..5aa279742da9 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -1496,8 +1496,7 @@ static int ext4_ext_search_left(struct inode *inode,
EXT4_ERROR_INODE(inode,
"ix (%d) != EXT_FIRST_INDEX (%d) (depth %d)!",
ix != NULL ? le32_to_cpu(ix->ei_block) : 0,
- EXT_FIRST_INDEX(path[depth].p_hdr) != NULL ?
- le32_to_cpu(EXT_FIRST_INDEX(path[depth].p_hdr)->ei_block) : 0,
+ le32_to_cpu(EXT_FIRST_INDEX(path[depth].p_hdr)->ei_block),
depth);
return -EFSCORRUPTED;
}
--
2.33.1



2021-11-17 20:26:20

by Andreas Dilger

[permalink] [raw]
Subject: Re: [PATCH] ext4: drop an always true check

On Nov 15, 2021, at 10:20 AM, Adam Borowski <[email protected]> wrote:
>
> EXT_FIRST_INDEX(ptr) is ptr+12, which can't possibly be null; gcc-12
> warns about this.
>
> Signed-off-by: Adam Borowski <[email protected]>

I was wondering if this was intending to check if path[depth].p_hdr was NULL,
but it is clear from the rest of the code that this could not be true, since
it is already being accessed earlier in the code, so this looks fine.

Reviewed-by: Andreas Dilger <[email protected]>

> ---
> fs/ext4/extents.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
> index 0ecf819bf189..5aa279742da9 100644
> --- a/fs/ext4/extents.c
> +++ b/fs/ext4/extents.c
> @@ -1496,8 +1496,7 @@ static int ext4_ext_search_left(struct inode *inode,
> EXT4_ERROR_INODE(inode,
> "ix (%d) != EXT_FIRST_INDEX (%d) (depth %d)!",
> ix != NULL ? le32_to_cpu(ix->ei_block) : 0,
> - EXT_FIRST_INDEX(path[depth].p_hdr) != NULL ?
> - le32_to_cpu(EXT_FIRST_INDEX(path[depth].p_hdr)->ei_block) : 0,
> + le32_to_cpu(EXT_FIRST_INDEX(path[depth].p_hdr)->ei_block),
> depth);
> return -EFSCORRUPTED;
> }
> --
> 2.33.1
>


Cheers, Andreas





Attachments:
signature.asc (873.00 B)
Message signed with OpenPGP

2022-01-06 04:42:11

by Theodore Ts'o

[permalink] [raw]
Subject: Re: [PATCH] ext4: drop an always true check

On Mon, 15 Nov 2021 18:20:20 +0100, Adam Borowski wrote:
> EXT_FIRST_INDEX(ptr) is ptr+12, which can't possibly be null; gcc-12
> warns about this.
>
>

Applied, thanks!

[1/1] ext4: drop an always true check
commit: a1f051415698049680c2bfb79d703e1ff7af36a3

Best regards,
--
Theodore Ts'o <[email protected]>