---

yaml --- r: 174368 b: refs/heads/master c: e6a4742 h: refs/heads/master v: v3
git-mirror · Nov 15, 2009 · 21377d6 · 21377d6
1 parent 4b6b959
commit 21377d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 567f3e9a70d71e5c9be03701b8578be77857293b
+refs/heads/master: e6a47428de84e19fda52f21ab73fde2906c40d09
diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c
@@ -1248,6 +1248,13 @@ int jbd2_journal_load(journal_t *journal)
 	if (jbd2_journal_recover(journal))
 		goto recovery_error;
 
+	if (journal->j_failed_commit) {
+		printk(KERN_ERR "JBD2: journal transaction %u on %s "
+		       "is corrupt.\n", journal->j_failed_commit,
+		       journal->j_devname);
+		return -EIO;
+	}
+
 	/* OK, we've finished with the dynamic journal bits:
 	 * reinitialise the dynamic contents of the superblock in memory
 	 * and reset them on disk. */