[Cluster-devel] [PATCH 53/56] fsck.gfs2: Print step 2 duplicate debug msg first

[Cluster-devel] [PATCH 53/56] fsck.gfs2: Print step 2 duplicate debug msg first

[Bob Peterson]

From e635bf72ab0a1e1c3a935336072ccbdb14718365 Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Tue, 23 Aug 2011 10:30:20 -0500
Subject: [PATCH 53/56] fsck.gfs2: Print step 2 duplicate debug msg first

In testing fsck.gfs2 I noticed that when duplicates were resolved,
the "step 2" debug message was printed after step 2 was actually
done.  That's misleading, so this patch changes it.

rhbz#675723
---
 gfs2/fsck/pass1b.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c
index a56ea31..ae6d45c 100644
--- a/gfs2/fsck/pass1b.c
+++ b/gfs2/fsck/pass1b.c
@@ -645,15 +645,15 @@ static int handle_dup_blk(struct gfs2_sbd *sdp, struct duptree *b)
 	 *          directory inode referencing a data block as a leaf block.
 	 */
 	if (!last_reference) {
-		last_reference = resolve_dup_references(sdp, b,
-							&b->ref_inode_list,
-							&dh, 0,
-							acceptable_ref);
 		log_debug( _("----------------------------------------------\n"
 			     "Step 2: Eliminate references to block %llu "
 			     "(0x%llx) that need the wrong block type.\n"),
 			   (unsigned long long)b->block,
 			   (unsigned long long)b->block);
+		last_reference = resolve_dup_references(sdp, b,
+							&b->ref_inode_list,
+							&dh, 0,
+							acceptable_ref);
 	}
 	/* Step 3 - We have multiple dinodes referencing it as the correct
 	 *          type.  Just blast one of them.
-- 
1.7.4.4