---

yaml --- r: 348107 b: refs/heads/master c: d096ad0 h: refs/heads/master i: 348105: c4aff68 348103: dfdbe75 v: v3
git-mirror · Dec 25, 2012 · cfa6b2d · cfa6b2d
1 parent 8d9399f
commit cfa6b2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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