From 683cf215fb897e52a9eb6e717180fbe2db5b0715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <zenczykowski@gmail.com>
Date: Wed, 27 Oct 2010 21:30:06 -0400
Subject: [PATCH] --- yaml --- r: 218867 b: refs/heads/master c:
 c41303ced67c4ebf51bf2e7d0f139155e09e0939 h: refs/heads/master i:   218865:
 d604d2759ee501c283b5c8d7e27110a84158c828   218863:
 d096b7f8d75948cd2a732778e92acb62bc05696c v: v3

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

diff --git a/[refs] b/[refs]
index 2cab3c623c01..86b3c256e9d3 100644
--- 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
index c5b890140d01..8a24e9be7cb0 100644
--- 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);