From 21377d6c0d74c140e376de7df1737060220106c0 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 15 Nov 2009 15:31:37 -0500
Subject: [PATCH] --- yaml --- r: 174368 b: refs/heads/master c:
 e6a47428de84e19fda52f21ab73fde2906c40d09 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0f2979105b99..c2d4d78af3df 100644
--- 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
index fed85388ee86..af60d98ddd22 100644
--- 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. */