From 916cd0c3838e50a4f9e289a49a965c39c80525d6 Mon Sep 17 00:00:00 2001
From: "Patrick J. LoPresti" <lopresti@gmail.com>
Date: Thu, 22 Jul 2010 15:04:16 -0700
Subject: [PATCH] --- yaml --- r: 212768 b: refs/heads/master c:
 1113e1b504f6e8d4364c0b73c9097828067d4617 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/jbd2/journal.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ed86e4dcb99b..e72479539605 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30ca22c70e3ef0a96ff84de69cd7e8561b416cb2
+refs/heads/master: 1113e1b504f6e8d4364c0b73c9097828067d4617
diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c
index 0e8014ea6b94..262419f83d80 100644
--- a/trunk/fs/jbd2/journal.c
+++ b/trunk/fs/jbd2/journal.c
@@ -1371,6 +1371,10 @@ int jbd2_journal_check_used_features (journal_t *journal, unsigned long compat,
 
 	if (!compat && !ro && !incompat)
 		return 1;
+	/* Load journal superblock if it is not loaded yet. */
+	if (journal->j_format_version == 0 &&
+	    journal_get_superblock(journal) != 0)
+		return 0;
 	if (journal->j_format_version == 1)
 		return 0;