diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-01-16 18:53:06 -0800 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2018-01-17 21:00:45 -0800 |
| commit | 52dc4b44af74196ded6413304542ead0257b5cda (patch) | |
| tree | f5896fc577ede48201cefa0ae25b5ae28113c147 /fs/xfs/scrub/btree.c | |
| parent | 166d76410d7ac08ba2fd90f33ebb545e21fd6b3a (diff) | |
xfs: cross-reference with the bnobt
When we're scrubbing various btrees, cross-reference the records with
the bnobt to ensure that we don't also think the space is free.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs/scrub/btree.c')
| -rw-r--r-- | fs/xfs/scrub/btree.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/fs/xfs/scrub/btree.c b/fs/xfs/scrub/btree.c index e671d694908b..222e0312bd8c 100644 --- a/fs/xfs/scrub/btree.c +++ b/fs/xfs/scrub/btree.c @@ -378,13 +378,17 @@ xfs_scrub_btree_check_block_owner( xfs_daddr_t daddr) { xfs_agnumber_t agno; + xfs_agblock_t agbno; + xfs_btnum_t btnum; bool init_sa; int error = 0; if (!bs->cur) return 0; + btnum = bs->cur->bc_btnum; agno = xfs_daddr_to_agno(bs->cur->bc_mp, daddr); + agbno = xfs_daddr_to_agbno(bs->cur->bc_mp, daddr); init_sa = bs->cur->bc_flags & XFS_BTREE_LONG_PTRS; if (init_sa) { @@ -394,6 +398,15 @@ xfs_scrub_btree_check_block_owner( return error; } + xfs_scrub_xref_is_used_space(bs->sc, agbno, 1); + /* + * The bnobt scrubber aliases bs->cur to bs->sc->sa.bno_cur, so we + * have to nullify it (to shut down further block owner checks) if + * self-xref encounters problems. + */ + if (!bs->sc->sa.bno_cur && btnum == XFS_BTNUM_BNO) + bs->cur = NULL; + if (init_sa) xfs_scrub_ag_free(bs->sc, &bs->sc->sa); |