VisionFive2 Linux kernel

StarFive Tech Linux Kernel for VisionFive (JH7110) boards (mirror)

More than 9999 Commits   32 Branches   54 Tags
author: Patrick J. LoPresti <lopresti@gmail.com> 2010-07-22 15:04:16 -0700 committer: Joel Becker <joel.becker@oracle.com> 2010-09-10 08:41:54 -0700 commit: 1113e1b504f6e8d4364c0b73c9097828067d4617 parent: 30ca22c70e3ef0a96ff84de69cd7e8561b416cb2
Commit Summary:
JBD2: Allow feature checks before journal recovery
Diffstat:
1 file changed, 4 insertions, 0 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 0e8014ea6b94..262419f83d80 100644
--- a/fs/jbd2/journal.c
+++ b/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;