Commit 4f5e3042 authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: cross-reference rmap records with refcount btrees

Strengthen the rmap btree record checker a little more by comparing
OWN_REFCBT reverse mappings against the refcount btrees.
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 0abe6fc5
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "xfs_alloc.h" #include "xfs_alloc.h"
#include "xfs_alloc_btree.h" #include "xfs_alloc_btree.h"
#include "xfs_ialloc_btree.h" #include "xfs_ialloc_btree.h"
#include "xfs_refcount_btree.h"
#include "scrub/scrub.h" #include "scrub/scrub.h"
#include "scrub/common.h" #include "scrub/common.h"
#include "scrub/btree.h" #include "scrub/btree.h"
...@@ -58,6 +59,7 @@ struct xchk_rmap { ...@@ -58,6 +59,7 @@ struct xchk_rmap {
struct xagb_bitmap log_owned; struct xagb_bitmap log_owned;
struct xagb_bitmap ag_owned; struct xagb_bitmap ag_owned;
struct xagb_bitmap inobt_owned; struct xagb_bitmap inobt_owned;
struct xagb_bitmap refcbt_owned;
/* Did we complete the AG space metadata bitmaps? */ /* Did we complete the AG space metadata bitmaps? */
bool bitmaps_complete; bool bitmaps_complete;
...@@ -304,6 +306,9 @@ xchk_rmapbt_mark_bitmap( ...@@ -304,6 +306,9 @@ xchk_rmapbt_mark_bitmap(
case XFS_RMAP_OWN_INOBT: case XFS_RMAP_OWN_INOBT:
bmp = &cr->inobt_owned; bmp = &cr->inobt_owned;
break; break;
case XFS_RMAP_OWN_REFC:
bmp = &cr->refcbt_owned;
break;
} }
if (!bmp) if (!bmp)
...@@ -461,6 +466,19 @@ xchk_rmapbt_walk_ag_metadata( ...@@ -461,6 +466,19 @@ xchk_rmapbt_walk_ag_metadata(
goto out; goto out;
} }
/* OWN_REFC: refcountbt */
if (xfs_has_reflink(sc->mp)) {
cur = sc->sa.refc_cur;
if (!cur)
cur = xfs_refcountbt_init_cursor(sc->mp, sc->tp,
sc->sa.agf_bp, sc->sa.pag);
error = xagb_bitmap_set_btblocks(&cr->refcbt_owned, cur);
if (cur != sc->sa.refc_cur)
xfs_btree_del_cursor(cur, error);
if (error)
goto out;
}
out: out:
/* /*
* If there's an error, set XFAIL and disable the bitmap * If there's an error, set XFAIL and disable the bitmap
...@@ -508,6 +526,9 @@ xchk_rmapbt_check_bitmaps( ...@@ -508,6 +526,9 @@ xchk_rmapbt_check_bitmaps(
if (xagb_bitmap_hweight(&cr->inobt_owned) != 0) if (xagb_bitmap_hweight(&cr->inobt_owned) != 0)
xchk_btree_xref_set_corrupt(sc, cur, level); xchk_btree_xref_set_corrupt(sc, cur, level);
if (xagb_bitmap_hweight(&cr->refcbt_owned) != 0)
xchk_btree_xref_set_corrupt(sc, cur, level);
} }
/* Scrub the rmap btree for some AG. */ /* Scrub the rmap btree for some AG. */
...@@ -526,6 +547,7 @@ xchk_rmapbt( ...@@ -526,6 +547,7 @@ xchk_rmapbt(
xagb_bitmap_init(&cr->log_owned); xagb_bitmap_init(&cr->log_owned);
xagb_bitmap_init(&cr->ag_owned); xagb_bitmap_init(&cr->ag_owned);
xagb_bitmap_init(&cr->inobt_owned); xagb_bitmap_init(&cr->inobt_owned);
xagb_bitmap_init(&cr->refcbt_owned);
error = xchk_rmapbt_walk_ag_metadata(sc, cr); error = xchk_rmapbt_walk_ag_metadata(sc, cr);
if (error) if (error)
...@@ -539,6 +561,7 @@ xchk_rmapbt( ...@@ -539,6 +561,7 @@ xchk_rmapbt(
xchk_rmapbt_check_bitmaps(sc, cr); xchk_rmapbt_check_bitmaps(sc, cr);
out: out:
xagb_bitmap_destroy(&cr->refcbt_owned);
xagb_bitmap_destroy(&cr->inobt_owned); xagb_bitmap_destroy(&cr->inobt_owned);
xagb_bitmap_destroy(&cr->ag_owned); xagb_bitmap_destroy(&cr->ag_owned);
xagb_bitmap_destroy(&cr->log_owned); xagb_bitmap_destroy(&cr->log_owned);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment