---

yaml --- r: 218867 b: refs/heads/master c: c41303c h: refs/heads/master i: 218865: d604d27 218863: d096b7f v: v3
git-mirror · Oct 28, 2010 · 683cf21 · 683cf21
1 parent d215a21
commit 683cf21
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: 2407518de63a2f80d9b850fb525f35df93bbbe53
+refs/heads/master: c41303ced67c4ebf51bf2e7d0f139155e09e0939
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
@@ -3908,7 +3908,7 @@ static int ext4_load_journal(struct super_block *sb,
 	EXT4_SB(sb)->s_journal = journal;
 	ext4_clear_journal_err(sb, es);
 
-	if (journal_devnum &&
+	if (!really_read_only && journal_devnum &&
 	    journal_devnum != le32_to_cpu(es->s_journal_dev)) {
 		es->s_journal_dev = cpu_to_le32(journal_devnum);