2019-01-15 17:15:27

by Liu Xiang

Subject: [PATCH] ext2: Remove redundant check on s_inode_size

The case of (EXT2_INODE_SIZE(sb) == 0) is included in
(sbi->s_inode_size < EXT2_GOOD_OLD_INODE_SIZE).
So there is no need to check again.

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

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 73b2d52..c71c2e3 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1024,8 +1024,6 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
sbi->s_frags_per_group = le32_to_cpu(es->s_frags_per_group);
sbi->s_inodes_per_group = le32_to_cpu(es->s_inodes_per_group);

- if (EXT2_INODE_SIZE(sb) == 0)
- goto cantfind_ext2;
sbi->s_inodes_per_block = sb->s_blocksize / EXT2_INODE_SIZE(sb);
if (sbi->s_inodes_per_block == 0 || sbi->s_inodes_per_group == 0)
goto cantfind_ext2;
--
1.9.1

2019-01-22 10:38:51

by Jan Kara

Subject: Re: [PATCH] ext2: Remove redundant check on s_inode_size

On Tue 15-01-19 22:10:43, Liu Xiang wrote:
> The case of (EXT2_INODE_SIZE(sb) == 0) is included in
> (sbi->s_inode_size < EXT2_GOOD_OLD_INODE_SIZE).
> So there is no need to check again.
>
> Signed-off-by: Liu Xiang <[email protected]>

Thanks for the cleanup. I have added it to my tree.

Honza

> ---
> fs/ext2/super.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/fs/ext2/super.c b/fs/ext2/super.c
> index 73b2d52..c71c2e3 100644
> --- a/fs/ext2/super.c
> +++ b/fs/ext2/super.c
> @@ -1024,8 +1024,6 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
> sbi->s_frags_per_group = le32_to_cpu(es->s_frags_per_group);
> sbi->s_inodes_per_group = le32_to_cpu(es->s_inodes_per_group);
>
> - if (EXT2_INODE_SIZE(sb) == 0)
> - goto cantfind_ext2;
> sbi->s_inodes_per_block = sb->s_blocksize / EXT2_INODE_SIZE(sb);
> if (sbi->s_inodes_per_block == 0 || sbi->s_inodes_per_group == 0)
> goto cantfind_ext2;
> --
> 1.9.1
>
>
--
Jan Kara <[email protected]>
SUSE Labs, CR