2008-03-20 23:32:53

by Chris Wright

[permalink] [raw]
Subject: patch jbd-correctly-unescape-journal-data-blocks.patch queued to 2.6.24-stable tree

This is a note to let you know that we have just queued up the patch titled

Subject: jbd: correctly unescape journal data blocks

to the 2.6.24-stable tree. Its filename is


A git repo of this tree can be found at

>From [email protected] Thu Mar 20 16:13:23 2008
Date: Thu, 20 Mar 2008 02:45:06 GMT
Message-Id: <[email protected]>
From: [email protected]
To: [email protected], [email protected]
Subject: jbd: correctly unescape journal data blocks

From: Duane Griffin <[email protected]>
commit: 439aeec639d7c57f3561054a6d315c40fd24bb74

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]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
fs/jbd/recovery.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/fs/jbd/recovery.c
+++ b/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 stable-queue which might be from [email protected] are