From: chrisw@sous-sol.org Subject: patch jbd-correctly-unescape-journal-data-blocks.patch queued to 2.6.24-stable tree Date: Thu, 20 Mar 2008 16:32:23 -0700 Message-ID: <200803202332.m2KNWN7o028588@sous-sol.org> References: <200803200245.m2K2j6jD024675@hera.kernel.org> Cc: stable@kernel.org, stable-commits@vger.kernel.org To: duaneg@dghda.com, akpm@linux-foundation.org, chrisw@sous-sol.org, jack@suse.cz, linux-ext4@vger.kernel.org, stable@kernel.org, torvalds@linux-foundation.org Return-path: Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:56376 "EHLO sous-sol.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754724AbYCTXcx (ORCPT ); Thu, 20 Mar 2008 19:32:53 -0400 In-Reply-To: <200803200245.m2K2j6jD024675@hera.kernel.org> Sender: linux-ext4-owner@vger.kernel.org List-ID: 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 jbd-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 stable-bounces@linux.kernel.org Thu Mar 20 16:13:23 2008 Date: Thu, 20 Mar 2008 02:45:06 GMT Message-Id: <200803200245.m2K2j6jD024675@hera.kernel.org> From: jejb@kernel.org To: jejb@kernel.org, stable@kernel.org Subject: jbd: correctly unescape journal data blocks From: Duane Griffin 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 Acked-by: Jan Kara Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright --- 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, journal->j_blocksize); if (flags & JFS_FLAG_ESCAPE) { - *((__be32 *)bh->b_data) = + *((__be32 *)nbh->b_data) = cpu_to_be32(JFS_MAGIC_NUMBER); } Patches currently in stable-queue which might be from duaneg@dghda.com are queue-2.6.24/jbd2-correctly-unescape-journal-data-blocks.patch queue-2.6.24/jbd-correctly-unescape-journal-data-blocks.patch