1 files changed, 9 insertions, 8 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index a221f1cdf704..53ff6c2a26ed 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4075,6 +4075,14 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
         sbi->s_groups_count = blocks_count;
         sbi->s_blockfile_groups = min_t(ext4_group_t, sbi->s_groups_count,
                         (EXT4_MAX_BLOCK_FILE_PHYS / EXT4_BLOCKS_PER_GROUP(sb)));
+        if (((u64)sbi->s_groups_count * sbi->s_inodes_per_group) !=
+            le32_to_cpu(es->s_inodes_count)) {
+                ext4_msg(sb, KERN_ERR, "inodes count not valid: %u vs %llu",
+                         le32_to_cpu(es->s_inodes_count),
+                         ((u64)sbi->s_groups_count * sbi->s_inodes_per_group));
+                ret = -EINVAL;
+                goto failed_mount;
+        }
         db_count = (sbi->s_groups_count + EXT4_DESC_PER_BLOCK(sb) - 1) /
                    EXT4_DESC_PER_BLOCK(sb);
         if (ext4_has_feature_meta_bg(sb)) {
@@ -4094,14 +4102,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                 ret = -ENOMEM;
                 goto failed_mount;
         }
-        if (((u64)sbi->s_groups_count * sbi->s_inodes_per_group) !=
-            le32_to_cpu(es->s_inodes_count)) {
-                ext4_msg(sb, KERN_ERR, "inodes count not valid: %u vs %llu",
-                         le32_to_cpu(es->s_inodes_count),
-                         ((u64)sbi->s_groups_count * sbi->s_inodes_per_group));
-                ret = -EINVAL;
-                goto failed_mount;
-        }
 
         bgl_lock_init(sbi->s_blockgroup_lock);
 
@@ -4510,6 +4510,7 @@ failed_mount6:
         percpu_counter_destroy(&sbi->s_freeinodes_counter);
         percpu_counter_destroy(&sbi->s_dirs_counter);
         percpu_counter_destroy(&sbi->s_dirtyclusters_counter);
+        percpu_free_rwsem(&sbi->s_journal_flag_rwsem);
 failed_mount5:
         ext4_ext_release(sb);
         ext4_release_system_zone(sb);