| Message ID | 8be03355983a08e5d4eed480944613454d7e2550.1585434649.git.josh@joshtriplett.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ext4: Fix incorrect inodes per group in error message | expand |
On Mar 28, 2020, at 4:34 PM, Josh Triplett <josh@joshtriplett.org> wrote: > > If ext4_fill_super detects an invalid number of inodes per group, the > resulting error message printed the number of blocks per group, rather > than the number of inodes per group. Fix it to print the correct value. > > Signed-off-by: Josh Triplett <josh@joshtriplett.org> > Fixes: cd6bb35bf7f6d ("ext4: use more strict checks for inodes_per_block on mount") LGTM Reviewed-by: Andreas Dilger <adilger@dilger.ca> > --- > fs/ext4/super.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index 0c7c4adb664e..c50922fa780a 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -4157,7 +4157,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) > if (sbi->s_inodes_per_group < sbi->s_inodes_per_block || > sbi->s_inodes_per_group > blocksize * 8) { > ext4_msg(sb, KERN_ERR, "invalid inodes per group: %lu\n", > - sbi->s_blocks_per_group); > + sbi->s_inodes_per_group); > goto failed_mount; > } > sbi->s_itb_per_group = sbi->s_inodes_per_group / > -- > 2.26.0 > Cheers, Andreas
On Sat, Mar 28, 2020 at 03:34:15PM -0700, Josh Triplett wrote: > If ext4_fill_super detects an invalid number of inodes per group, the > resulting error message printed the number of blocks per group, rather > than the number of inodes per group. Fix it to print the correct value. > > Signed-off-by: Josh Triplett <josh@joshtriplett.org> > Fixes: cd6bb35bf7f6d ("ext4: use more strict checks for inodes_per_block on mount") Applied, thanks. - Ted
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 0c7c4adb664e..c50922fa780a 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4157,7 +4157,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) if (sbi->s_inodes_per_group < sbi->s_inodes_per_block || sbi->s_inodes_per_group > blocksize * 8) { ext4_msg(sb, KERN_ERR, "invalid inodes per group: %lu\n", - sbi->s_blocks_per_group); + sbi->s_inodes_per_group); goto failed_mount; } sbi->s_itb_per_group = sbi->s_inodes_per_group /
If ext4_fill_super detects an invalid number of inodes per group, the resulting error message printed the number of blocks per group, rather than the number of inodes per group. Fix it to print the correct value. Signed-off-by: Josh Triplett <josh@joshtriplett.org> Fixes: cd6bb35bf7f6d ("ext4: use more strict checks for inodes_per_block on mount") --- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)