From cfa6b2dbd6cd211ba839d920ab9b11eab14274d5 Mon Sep 17 00:00:00 2001
From: Michael Tokarev <mjt@tls.msk.ru>
Date: Tue, 25 Dec 2012 14:08:16 -0500
Subject: [PATCH] --- yaml --- r: 348107 b: refs/heads/master c:
 d096ad0f79a782935d2e06ae8fb235e8c5397775 h: refs/heads/master i:   348105:
 c4aff686271364c868fdf412a6f16b48d3e070a9   348103:
 dfdbe7550d427cb00b64a244f0fb2655676a7fce v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/super.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f3be8f671203..3116d469d571 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0875a2b448fcaba67010850cf9649293a5ef653d
+refs/heads/master: d096ad0f79a782935d2e06ae8fb235e8c5397775
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 4969167ac267..183ae3447f64 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -4729,7 +4729,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
 	}
 
 	ext4_setup_system_zone(sb);
-	if (sbi->s_journal == NULL)
+	if (sbi->s_journal == NULL && !(old_sb_flags & MS_RDONLY))
 		ext4_commit_super(sb, 1);
 
 #ifdef CONFIG_QUOTA