From f31982aed0dc506c6863ff13777f2bb8a9566664 Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Tue, 4 Aug 2015 08:36:44 +1000 Subject: [PATCH] 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 Reviewed-by: Eric Sandeen Signed-off-by: Dave Chinner --- 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 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); -- 2.47.2