1 files changed, 8 insertions, 2 deletions

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 1ec602673ea..f98c390caf1 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -747,15 +747,18 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
         __le32 features;
         int err;
 
+        lock_kernel();
+
+        err = -ENOMEM;
         sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
         if (!sbi)
-                return -ENOMEM;
+                goto failed_unlock;
 
         sbi->s_blockgroup_lock =
                 kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL);
         if (!sbi->s_blockgroup_lock) {
                 kfree(sbi);
-                return -ENOMEM;
+                goto failed_unlock;
         }
         sb->s_fs_info = sbi;
         sbi->s_sb_block = sb_block;
@@ -1083,6 +1086,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
         if (ext2_setup_super (sb, es, sb->s_flags & MS_RDONLY))
                 sb->s_flags |= MS_RDONLY;
         ext2_write_super(sb);
+        unlock_kernel();
         return 0;
 
 cantfind_ext2:
@@ -1107,6 +1111,8 @@ failed_sbi:
         sb->s_fs_info = NULL;
         kfree(sbi->s_blockgroup_lock);
         kfree(sbi);
+failed_unlock:
+        unlock_kernel();
         return ret;
 }