cluster: RHEL510 - fsck.gfs2: Print step 2 duplicate debug msg first

Bob Peterson rpeterso at fedoraproject.org
Fri Apr 5 13:46:16 UTC 2013


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=68922b8444c39c78a79b9f62062e60adfaa5f1ea
Commit:        68922b8444c39c78a79b9f62062e60adfaa5f1ea
Parent:        088b93612bafef494994e2dc116e4ae64f442585
Author:        Bob Peterson <rpeterso at redhat.com>
AuthorDate:    Fri Jan 6 14:19:09 2012 -0600
Committer:     Bob Peterson <rpeterso at redhat.com>
CommitterDate: Fri Apr 5 06:25:00 2013 -0700

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#877150
---
 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 b296c54..f2922b6 100644
--- a/gfs2/fsck/pass1b.c
+++ b/gfs2/fsck/pass1b.c
@@ -657,15 +657,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.


More information about the cluster-commits mailing list