From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9243 invoked by alias); 6 Apr 2009 16:35:34 -0000 Received: (qmail 9237 invoked by alias); 6 Apr 2009 16:35:33 -0000 X-SWARE-Spam-Status: No, hits=-1.0 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_41,SPF_HELO_PASS X-Spam-Status: No, hits=-1.0 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_41,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: RHEL5 - Fix block count in pass1b. To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: b16f07ed9033994e16610196046660960c0f4424 X-Git-Newrev: f74e81372ebf436590090e016e9d1a6e84969b86 From: Bob Peterson Message-Id: <20090406163502.B1CF5120263@lists.fedorahosted.org> Date: Mon, 06 Apr 2009 16:35:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00030.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f74e81372ebf436590090e016e9d1a6e84969b86 Commit: f74e81372ebf436590090e016e9d1a6e84969b86 Parent: b16f07ed9033994e16610196046660960c0f4424 Author: Bob Peterson AuthorDate: Sun Apr 5 20:22:30 2009 -0500 Committer: Bob Peterson CommitterDate: Sun Apr 5 20:22:30 2009 -0500 Fix block count in pass1b. bz 493727 - GFS: gfs_fsck can delete everything in a corrupt file system When duplicate blocks are discovered by gfs_fsck, the block count was not being saved by the duplicate processing code. That caused the fsck to think there were zero blocks in the directory. The descrepency caused the whole root directory to be deleted. --- gfs/gfs_fsck/pass1b.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/gfs/gfs_fsck/pass1b.c b/gfs/gfs_fsck/pass1b.c index 5cb7d66..1f53e56 100644 --- a/gfs/gfs_fsck/pass1b.c +++ b/gfs/gfs_fsck/pass1b.c @@ -138,6 +138,8 @@ static int find_dentry(struct fsck_inode *ip, struct gfs_dirent *de, osi_list_t *tmp1, *tmp2; struct blocks *b; struct inode_with_dups *id; + struct gfs_leaf leaf; + osi_list_foreach(tmp1, &ip->i_sbd->dup_list) { b = osi_list_entry(tmp1, struct blocks, list); osi_list_foreach(tmp2, &b->ref_inode_list) { @@ -162,6 +164,10 @@ static int find_dentry(struct fsck_inode *ip, struct gfs_dirent *de, } } } + /* Return the number of leaf entries so metawalk doesn't flag this + leaf as having none. */ + gfs_leaf_in(&leaf, bh->b_data); + *count = leaf.lf_entries; return 0; }