| Message ID | 20180322062410.GU4818@magnolia (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Mar 21, 2018 at 11:24:10PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > During the inode btree scrubs we try to confirm the freemask bits > against the inode records. If the inode buffer read fails, this is a > cross-referencing error, not a corruption of the inode btree itself. > Use the xref_process_error call here. Found via core.version middlebit > fuzz in xfs/415. > > The userspace xfs_scrub program will try to repair outright corruptions > in the agi/inobt prior to phase 3 so that the inode scan will proceed. > If only a cross-referencing error is noted, the repair program defers > the repair attempt until it can check the other space metadata at least > once. > > It is therefore essential that the inobt scrubber can correctly > distinguish between corruptions and "unable to cross-reference something > else with this inobt". > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > v2: clarify why we're doing this in the commit message > --- Thanks! Reviewed-by: Brian Foster <bfoster@redhat.com> > fs/xfs/scrub/ialloc.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c > index 63ab3f9..32e0d1a 100644 > --- a/fs/xfs/scrub/ialloc.c > +++ b/fs/xfs/scrub/ialloc.c > @@ -259,7 +259,8 @@ xfs_scrub_iallocbt_check_freemask( > > error = xfs_imap_to_bp(mp, bs->cur->bc_tp, &imap, > &dip, &bp, 0, 0); > - if (!xfs_scrub_btree_process_error(bs->sc, bs->cur, 0, &error)) > + if (!xfs_scrub_btree_xref_process_error(bs->sc, bs->cur, 0, > + &error)) > continue; > > /* Which inodes are free? */ > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c index 63ab3f9..32e0d1a 100644 --- a/fs/xfs/scrub/ialloc.c +++ b/fs/xfs/scrub/ialloc.c @@ -259,7 +259,8 @@ xfs_scrub_iallocbt_check_freemask( error = xfs_imap_to_bp(mp, bs->cur->bc_tp, &imap, &dip, &bp, 0, 0); - if (!xfs_scrub_btree_process_error(bs->sc, bs->cur, 0, &error)) + if (!xfs_scrub_btree_xref_process_error(bs->sc, bs->cur, 0, + &error)) continue; /* Which inodes are free? */