Merge branch 'master' into next

1 files changed, 6 insertions, 3 deletions

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index da8bdeaa2e6d..7c6e3606f0ec 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1185,9 +1185,12 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
         es = sbi->s_es;
         if (((sbi->s_mount_opt & EXT2_MOUNT_XIP) !=
             (old_mount_opt & EXT2_MOUNT_XIP)) &&
-            invalidate_inodes(sb))
-                ext2_warning(sb, __func__, "busy inodes while remounting "\
-                             "xip remain in cache (no functional problem)");
+            invalidate_inodes(sb)) {
+                ext2_warning(sb, __func__, "refusing change of xip flag "
+                             "with busy inodes while remounting");
+                sbi->s_mount_opt &= ~EXT2_MOUNT_XIP;
+                sbi->s_mount_opt |= old_mount_opt & EXT2_MOUNT_XIP;
+        }
         if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
                 return 0;
         if (*flags & MS_RDONLY) {