From: Dave Chinner <dchinner@redhat.com>
Date: Mon, 3 Aug 2015 22:36:44 +0000 (+1000)
Subject: repair: use sb_meta_uuid for checking of metadata headers
X-Git-Tag: v4.2.0-rc1~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f31982aed0dc506c6863ff13777f2bb8a9566664;p=thirdparty%2Fxfsprogs-dev.git

repair: use sb_meta_uuid for checking of metadata headers

Now that we can change the uuid on v5 filesystems, we always need to
verify the metadata uuid against sb_meta_uuid, not sb_uuid. This
fixes quite a few xfstests failures when UUIDs are changed before
executing tests.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/repair/phase6.c b/repair/phase6.c
index 09da2e22a..ad9be3804 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1960,7 +1960,7 @@ _("expected block %" PRIu64 ", got %llu, directory inode %" PRIu64 "\n"),
 		return 1;
 	}
 	/* verify uuid */
-	if (platform_uuid_compare(uuid, &mp->m_sb.sb_uuid) != 0) {
+	if (platform_uuid_compare(uuid, &mp->m_sb.sb_meta_uuid) != 0) {
 		do_warn(
 _("wrong FS UUID, directory inode %" PRIu64 " block %" PRIu64 "\n"),
 			ino, bp->b_bn);
diff --git a/repair/scan.c b/repair/scan.c
index 8711b94ce..95b8ade2c 100644
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -237,7 +237,7 @@ _("expected block %" PRIu64 ", got %llu, bmbt block %" PRIu64 "\n"),
 		}
 		/* verify uuid */
 		if (platform_uuid_compare(&block->bb_u.l.bb_uuid,
-					  &mp->m_sb.sb_uuid) != 0) {
+					  &mp->m_sb.sb_meta_uuid) != 0) {
 			do_warn(
 _("wrong FS UUID, bmbt block %" PRIu64 "\n"),
 				bno);