ext4: fix incorrect inodes per group in error message
authorJosh Triplett <josh@joshtriplett.org>
Sat, 28 Mar 2020 22:34:15 +0000 (15:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Apr 2020 05:57:19 +0000 (07:57 +0200)
commit b9c538da4e52a7b79dfcf4cfa487c46125066dfb upstream.

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.

Fixes: cd6bb35bf7f6d ("ext4: use more strict checks for inodes_per_block on mount")
Link: https://lore.kernel.org/r/8be03355983a08e5d4eed480944613454d7e2550.1585434649.git.josh@joshtriplett.org
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ext4/super.c

index 7ff4cdc4d1dff21504391cf15dc25a2914f482d8..f778eb4b3e5b6c6a7dd900e5d9c33c61f7c3345a 100644 (file)
@@ -3660,7 +3660,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 /