Push BKL down into ->remount_fs()

[net-next-2.6.git] / fs / ext4 / super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index c17200a42301a461c894771b7c8f6b38bc8b1d01..012c4251397e9f3331ba95e1e56ca669481e4006 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3422,6 +3422,8 @@ static int ext4_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;
@@ -3558,6 +3560,7 @@ static int ext4_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:
@@ -3578,6 +3581,7 @@ restore_opts:
        }
 #endif
        unlock_super(sb);
+       unlock_kernel();
        return err;
 }