---

yaml --- r: 212768 b: refs/heads/master c: 1113e1b h: refs/heads/master v: v3
git-mirror · Sep 10, 2010 · 916cd0c · 916cd0c
1 parent 620f27b
commit 916cd0c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;