Push BKL down into ->remount_fs()

[mirror_ubuntu-artful-kernel.git] / fs / ext3 / super.c

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index e213a2613a56164cd8e363c582bd76f893baae2b..26aa64dee6aacea86c6b2082d2f06d07c01b8d34 100644 (file)
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2490,6 +2490,8 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
        int i;
 #endif
 
+       lock_kernel();
+
        /* Store the original options */
        lock_super(sb);
        old_sb_flags = sb->s_flags;
@@ -2600,6 +2602,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
                        kfree(old_opts.s_qf_names[i]);
 #endif
        unlock_super(sb);
+       unlock_kernel();
        return 0;
 restore_opts:
        sb->s_flags = old_sb_flags;
@@ -2617,6 +2620,7 @@ restore_opts:
        }
 #endif
        unlock_super(sb);
+       unlock_kernel();
        return err;
 }