2008-03-21 20:29:53

by Andrew Morton

[permalink] [raw]
Subject: - jbd-correctly-unescape-journal-data-blocks.patch removed from -mm tree

The patch titled
jbd: correctly unescape journal data blocks
has been removed from the -mm tree. Its filename was

This patch was dropped because it was merged into mainline or a subsystem tree

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

Subject: jbd: correctly unescape journal data blocks
From: "Duane Griffin" <[email protected]>

Fix a long-standing typo (predating git) that will cause data corruption if a
journal data block needs unescaping. At the moment the wrong buffer head's
data is being unescaped.

To test this case mount a filesystem with data=journal, start creating and
deleting a bunch of files containing only JFS_MAGIC_NUMBER (0xc03b3998), then
pull the plug on the device. Without this patch the files will contain zeros
instead of the correct data after recovery.

Signed-off-by: Duane Griffin <[email protected]>
Acked-by: Jan Kara <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

fs/jbd/recovery.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/jbd/recovery.c~jbd-correctly-unescape-journal-data-blocks fs/jbd/recovery.c
--- a/fs/jbd/recovery.c~jbd-correctly-unescape-journal-data-blocks
+++ a/fs/jbd/recovery.c
@@ -478,7 +478,7 @@ static int do_one_pass(journal_t *journa
memcpy(nbh->b_data, obh->b_data,
if (flags & JFS_FLAG_ESCAPE) {
- *((__be32 *)bh->b_data) =
+ *((__be32 *)nbh->b_data) =


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