This message generated a parse failure. Raw output follows here. Please use 'back' to navigate. From devnull@lkml.org Tue May 21 12:31:46 2024 Received: from spaans.ds9a.nl (adsl-xs4all.ds9a.nl [213.84.159.51]) by kylie.puddingonline.com (8.11.6/8.11.6) with SMTP id g8IKW5X21572 for ; Wed, 18 Sep 2002 22:32:05 +0200 Received: (qmail 30663 invoked from network); 18 Sep 2002 07:56:16 -0000 Received: from unknown (HELO spaans.ds9a.nl) (3ffe:8280:10:360:202:44ff:fe2a:a1dd) by mayo.ipv6.ds9a.nl with SMTP; 18 Sep 2002 07:56:16 -0000 Received: (qmail 14252 invoked by uid 1000); 17 Sep 2002 21:26:08 -0000 Received: (maildatabase); juh Received: (qmail 24349 invoked by alias); 10 Apr 2002 15:01:06 -0000 Received: (qmail 24334 invoked from network); 10 Apr 2002 15:01:05 -0000 Received: from unknown (HELO dipsaus.ds9a.tudelft.nl) (::ffff:10.0.0.202) by spaans.ds9a.nl with SMTP; 10 Apr 2002 15:01:05 -0000 Received: (qmail 27252 invoked from network); 10 Apr 2002 15:01:05 -0000 Received: from unknown (HELO vger.kernel.org) (::ffff:209.116.70.75) by adsl-xs4all.ds9a.nl with SMTP; 10 Apr 2002 15:01:05 -0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Wed, 10 Apr 2002 10:58:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Wed, 10 Apr 2002 10:58:27 -0400 Received: from thebsh.namesys.com ([212.16.7.65]:1808 "HELO thebsh.namesys.com") by vger.kernel.org with SMTP id ; Wed, 10 Apr 2002 10:58:23 -0400 Received: (qmail 18892 invoked from network); 10 Apr 2002 14:58:20 -0000 Received: from backtop.namesys.com (HELO namesys.com) (212.16.7.71) by thebsh.namesys.com with SMTP; 10 Apr 2002 14:58:20 -0000 Message-Id: <3CB451F6.5000600@namesys.com> Date: Wed, 10 Apr 2002 18:53:42 +0400 From: Hans Reiser User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:0.9.9) Gecko/20020310 X-Accept-Language: en-us, en Mime-Version: 1.0 To: linux-kernel@vger.kernel.org, torvalds@transmeta.com Subject: [PATCH] ReiserFS bugfixes 7 of 13, please apply Content-Type: multipart/mixed; boundary="------------010504090801020504010905" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org X-Spam-Status: No, hits=-5.0 required=6.0 tests=UNIFIED_PATCH version=2.11 Lines: 110 This is a multi-part message in MIME format. --------------010504090801020504010905 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit --------------010504090801020504010905 Content-Type: message/rfc822; name="[PATCH] 2.5.8-pre3 patch 7 of 13" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="[PATCH] 2.5.8-pre3 patch 7 of 13" From - Wed Apr 10 15:37:37 2002 X-Mozilla-Status2: 00000000 Return-Path: Delivered-To: reiser@namesys.com Received: (qmail 13260 invoked from network); 10 Apr 2002 11:21:51 -0000 Received: from angband.namesys.com (postfix@212.16.7.85) by thebsh.namesys.com with SMTP; 10 Apr 2002 11:21:51 -0000 Received: by angband.namesys.com (Postfix on SuSE Linux 7.3 (i386), from userid 521) id EA9314D1B33; Wed, 10 Apr 2002 15:21:50 +0400 (MSD) Date: Wed, 10 Apr 2002 15:21:50 +0400 From: Oleg Drokin To: reiser@namesys.com Subject: [PATCH] 2.5.8-pre3 patch 7 of 13 Message-ID: <20020410152150.A20891@namesys.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.22.1i This patch is to fix journal replay bug where old code would replay transactions with mount_id != mount_id recorded in journal header. Fixed by Chris Mason. --- linux-2.5.8-pre2/fs/reiserfs/journal.c.orig Mon Apr 8 15:31:43 2002 +++ linux-2.5.8-pre2/fs/reiserfs/journal.c Mon Apr 8 15:32:20 2002 @@ -1651,11 +1651,9 @@ } static int journal_read(struct super_block *p_s_sb) { struct reiserfs_journal_desc *desc ; - unsigned long last_flush_trans_id = 0 ; unsigned long oldest_trans_id = 0; unsigned long oldest_invalid_trans_id = 0 ; time_t start ; - unsigned long last_flush_start = 0; unsigned long oldest_start = 0; unsigned long cur_dblock = 0 ; unsigned long newest_mount_id = 9 ; @@ -1685,13 +1683,14 @@ if (le32_to_cpu(jh->j_first_unflushed_offset) >= 0 && le32_to_cpu(jh->j_first_unflushed_offset) < SB_ONDISK_JOURNAL_SIZE(p_s_sb) && le32_to_cpu(jh->j_last_flush_trans_id) > 0) { - last_flush_start = SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) + + oldest_start = SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) + le32_to_cpu(jh->j_first_unflushed_offset) ; - last_flush_trans_id = le32_to_cpu(jh->j_last_flush_trans_id) ; + oldest_trans_id = le32_to_cpu(jh->j_last_flush_trans_id) + 1; + newest_mount_id = le32_to_cpu(jh->j_mount_id); reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE, "journal-1153: found in " "header: first_unflushed_offset %d, last_flushed_trans_id " "%lu\n", le32_to_cpu(jh->j_first_unflushed_offset), - last_flush_trans_id) ; + le32_to_cpu(jh->j_last_flush_trans_id)) ; valid_journal_header = 1 ; /* now, we try to read the first unflushed offset. If it is not valid, @@ -1704,6 +1703,7 @@ continue_replay = 0 ; } brelse(d_bh) ; + goto start_log_replay; } if (continue_replay && is_read_only(p_s_sb->s_dev)) { @@ -1746,17 +1746,13 @@ "newest_mount_id to %d\n", le32_to_cpu(desc->j_mount_id)); } cur_dblock += le32_to_cpu(desc->j_len) + 2 ; - } - else { + } else { cur_dblock++ ; } brelse(d_bh) ; } - /* step three, starting at the oldest transaction, replay */ - if (last_flush_start > 0) { - oldest_start = last_flush_start ; - oldest_trans_id = last_flush_trans_id + 1 ; - } + +start_log_replay: cur_dblock = oldest_start ; if (oldest_trans_id) { reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE, "journal-1206: Starting replay " --------------010504090801020504010905-- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/