Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 12 insertions, 1 deletions

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 6356665a74bb..c47f14750722 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -174,6 +174,11 @@ static void ext3_handle_error(struct super_block *sb)
         if (test_opt (sb, ERRORS_RO)) {
                 ext3_msg(sb, KERN_CRIT,
                         "error: remounting filesystem read-only");
+                /*
+                 * Make sure updated value of ->s_mount_state will be visible
+                 * before ->s_flags update.
+                 */
+                smp_wmb();
                 sb->s_flags |= MS_RDONLY;
         }
         ext3_commit_super(sb, es, 1);
@@ -291,8 +296,14 @@ void ext3_abort(struct super_block *sb, const char *function,
         ext3_msg(sb, KERN_CRIT,
                 "error: remounting filesystem read-only");
         EXT3_SB(sb)->s_mount_state |= EXT3_ERROR_FS;
-        sb->s_flags |= MS_RDONLY;
         set_opt(EXT3_SB(sb)->s_mount_opt, ABORT);
+        /*
+         * Make sure updated value of ->s_mount_state will be visible
+         * before ->s_flags update.
+         */
+        smp_wmb();
+        sb->s_flags |= MS_RDONLY;
+
         if (EXT3_SB(sb)->s_journal)
                 journal_abort(EXT3_SB(sb)->s_journal, -EIO);
 }