This is a note to let you know that we have just queued up the patch titled
Subject: jbd2: correctly unescape journal data blocks
to the 2.6.24-stable tree. Its filename is
jbd2-correctly-unescape-journal-data-blocks.patch
A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>From [email protected] Thu Mar 20 16:12:49 2008
Date: Thu, 20 Mar 2008 02:45:05 GMT
Message-Id: <[email protected]>
From: [email protected]
To: [email protected], [email protected]
Subject: jbd2: correctly unescape journal data blocks
From: Duane Griffin <[email protected]>
commit: d00256766a0b4f1441931a7f569a13edf6c68200
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 JBD2_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/jbd2/recovery.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/jbd2/recovery.c
+++ b/fs/jbd2/recovery.c
@@ -488,7 +488,7 @@ static int do_one_pass(journal_t *journa
memcpy(nbh->b_data, obh->b_data,
journal->j_blocksize);
if (flags & JBD2_FLAG_ESCAPE) {
- *((__be32 *)bh->b_data) =
+ *((__be32 *)nbh->b_data) =
cpu_to_be32(JBD2_MAGIC_NUMBER);
}
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.24/jbd2-correctly-unescape-journal-data-blocks.patch
queue-2.6.24/jbd-correctly-unescape-journal-data-blocks.patch