cluster: STABLE2 - Fix block count in pass1b.

cluster: STABLE2 - Fix block count in pass1b.

[Bob Peterson]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b518f58fd3a512bf01566dbf595ecbbda119963b
Commit:        b518f58fd3a512bf01566dbf595ecbbda119963b
Parent:        48d07fb8c7b485cb6c05d2d09718697e08e81367
Author:        Bob Peterson <rpeterso@redhat.com>
AuthorDate:    Sun Apr 5 20:35:31 2009 -0500
Committer:     Bob Peterson <rpeterso@redhat.com>
CommitterDate: Sun Apr 5 20:35:31 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 39d437d..9f32aa6 100644
--- a/gfs/gfs_fsck/pass1b.c
+++ b/gfs/gfs_fsck/pass1b.c
@@ -125,6 +125,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) {
@@ -149,6 +151,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;
 }