* [PATCH 0/2] xfsprogs: sb_meta_uuid fixes @ 2015-08-03 7:42 Dave Chinner 2015-08-03 7:42 ` [PATCH 1/2] repair: use sb_meta_uuid for checking of metadata headers Dave Chinner 2015-08-03 7:42 ` [PATCH 2/2] libxfs: fix uuid check durign inode allocation Dave Chinner 0 siblings, 2 replies; 5+ messages in thread From: Dave Chinner @ 2015-08-03 7:42 UTC (permalink / raw) To: xfs HI folks, THis is the userspace side fixes that I've needed to make to get xfstests to pass without regressions with a modified sb_meta_uuid. Same circumstances as the kernel side patches I just sent.... Cheers, Dave. _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] repair: use sb_meta_uuid for checking of metadata headers 2015-08-03 7:42 [PATCH 0/2] xfsprogs: sb_meta_uuid fixes Dave Chinner @ 2015-08-03 7:42 ` Dave Chinner 2015-08-03 22:28 ` Eric Sandeen 2015-08-03 7:42 ` [PATCH 2/2] libxfs: fix uuid check durign inode allocation Dave Chinner 1 sibling, 1 reply; 5+ messages in thread From: Dave Chinner @ 2015-08-03 7:42 UTC (permalink / raw) To: xfs 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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] repair: use sb_meta_uuid for checking of metadata headers 2015-08-03 7:42 ` [PATCH 1/2] repair: use sb_meta_uuid for checking of metadata headers Dave Chinner @ 2015-08-03 22:28 ` Eric Sandeen 0 siblings, 0 replies; 5+ messages in thread From: Eric Sandeen @ 2015-08-03 22:28 UTC (permalink / raw) To: Dave Chinner, xfs On 8/3/15 12:42 AM, Dave Chinner wrote: > 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> I have no plausible excuse for this one... ;) Reviewed-by: Eric Sandeen <sandeen@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); > _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] libxfs: fix uuid check durign inode allocation 2015-08-03 7:42 [PATCH 0/2] xfsprogs: sb_meta_uuid fixes Dave Chinner 2015-08-03 7:42 ` [PATCH 1/2] repair: use sb_meta_uuid for checking of metadata headers Dave Chinner @ 2015-08-03 7:42 ` Dave Chinner 2015-08-03 22:29 ` Eric Sandeen 1 sibling, 1 reply; 5+ messages in thread From: Dave Chinner @ 2015-08-03 7:42 UTC (permalink / raw) To: xfs From: Dave Chinner <dchinner@redhat.com> Needs to check sb_meta_uuid now that we the sb_uuid can change on v5 filesystems. Signed-off-by: Dave Chinner <dchinner@redhat.com> --- libxfs/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libxfs/util.c b/libxfs/util.c index 719a5b7..f427d22 100644 --- a/libxfs/util.c +++ b/libxfs/util.c @@ -262,7 +262,7 @@ libxfs_ialloc( if (ip->i_d.di_version == 3) { ASSERT(ip->i_d.di_ino == ino); - ASSERT(uuid_equal(&ip->i_d.di_uuid, &mp->m_sb.sb_uuid)); + ASSERT(uuid_equal(&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid)); ip->i_d.di_crc = 0; ip->i_d.di_changecount = 1; ip->i_d.di_lsn = 0; -- 2.1.4 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] libxfs: fix uuid check durign inode allocation 2015-08-03 7:42 ` [PATCH 2/2] libxfs: fix uuid check durign inode allocation Dave Chinner @ 2015-08-03 22:29 ` Eric Sandeen 0 siblings, 0 replies; 5+ messages in thread From: Eric Sandeen @ 2015-08-03 22:29 UTC (permalink / raw) To: Dave Chinner, xfs On 8/3/15 12:42 AM, Dave Chinner wrote: > From: Dave Chinner <dchinner@redhat.com> > > Needs to check sb_meta_uuid now that we the sb_uuid can change on v5 > filesystems. > > Signed-off-by: Dave Chinner <dchinner@redhat.com> ASSERTs are off in libxfs anyway right? Still: Reviewed-by: Eric Sandeen <sandeen@redhat.com> > --- > libxfs/util.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libxfs/util.c b/libxfs/util.c > index 719a5b7..f427d22 100644 > --- a/libxfs/util.c > +++ b/libxfs/util.c > @@ -262,7 +262,7 @@ libxfs_ialloc( > > if (ip->i_d.di_version == 3) { > ASSERT(ip->i_d.di_ino == ino); > - ASSERT(uuid_equal(&ip->i_d.di_uuid, &mp->m_sb.sb_uuid)); > + ASSERT(uuid_equal(&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid)); > ip->i_d.di_crc = 0; > ip->i_d.di_changecount = 1; > ip->i_d.di_lsn = 0; > _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-08-03 22:29 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-08-03 7:42 [PATCH 0/2] xfsprogs: sb_meta_uuid fixes Dave Chinner 2015-08-03 7:42 ` [PATCH 1/2] repair: use sb_meta_uuid for checking of metadata headers Dave Chinner 2015-08-03 22:28 ` 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
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox