2008-07-29 06:57:52

by Andrew Morton

[permalink] [raw]
Subject: + jbd-abort-when-failed-to-log-metadata-buffers.patch added to -mm tree

The patch titled
jbd: abort when failed to log metadata buffers
has been added to the -mm tree. Its filename is

Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

Subject: jbd: abort when failed to log metadata buffers
From: Hidehiro Kawai <[email protected]>

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 <[email protected]>
Acked-by: Jan Kara <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

fs/jbd/commit.c | 3 +++
1 file changed, 3 insertions(+)

diff -puN fs/jbd/commit.c~jbd-abort-when-failed-to-log-metadata-buffers fs/jbd/commit.c
--- a/fs/jbd/commit.c~jbd-abort-when-failed-to-log-metadata-buffers
+++ a/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))

Patches currently in -mm which might be from [email protected] are