From: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Date: Sun, 19 Oct 2008 03:27:53 +0000 (-0700)
Subject: jbd: abort when failed to log metadata buffers
X-Git-Tag: v2.6.28-rc1~165
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d1645e526a1e5842c9ac433d73419ba886676cf3;p=linux-2.6-omap-h63xx.git

jbd: abort when failed to log metadata buffers

If we failed to write metadata buffers to the journal space and succeeded
to write the commit record, stale data can be written back to the
filesystem as metadata in the recovery phase.

To avoid this, when we failed to write out metadata buffers, abort the
journal before writing the commit record.

Signed-off-by: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Acked-by: Jan Kara <jack@suse.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index ae08c057e75..f1ea861b992 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -762,6 +762,9 @@ wait_for_iobuf:
 		/* AKPM: bforget here */
 	}
 
+	if (err)
+		journal_abort(journal, err);
+
 	jbd_debug(3, "JBD: commit phase 6\n");
 
 	if (journal_write_commit_record(journal, commit_transaction))