From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 1/2] repair: use sb_meta_uuid for checking of metadata headers
Date: Mon, 3 Aug 2015 17:42:28 +1000 [thread overview]
Message-ID: <1438587749-31597-2-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1438587749-31597-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
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>
---
repair/phase6.c | 2 +-
repair/scan.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/repair/phase6.c b/repair/phase6.c
index 09da2e2..ad9be38 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 8711b94..95b8ade 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);
--
2.1.4
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-08-03 7:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-03 7:42 [PATCH 0/2] xfsprogs: sb_meta_uuid fixes Dave Chinner
2015-08-03 7:42 ` Dave Chinner [this message]
2015-08-03 22:28 ` [PATCH 1/2] repair: use sb_meta_uuid for checking of metadata headers Eric Sandeen
2015-08-03 7:42 ` [PATCH 2/2] libxfs: fix uuid check durign inode allocation Dave Chinner
2015-08-03 22:29 ` Eric Sandeen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438587749-31597-2-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox