On 8/3/15 12:42 AM, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
I have no plausible excuse for this one... ;)
Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> ---
> 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);
>
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
