From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 3/4] xfs: cross-reference rmap records with inode btrees
Date: Sun, 02 Oct 2022 11:20:47 -0700 [thread overview]
Message-ID: <166473484793.1085478.2493682708372844356.stgit@magnolia> (raw)
In-Reply-To: <166473484745.1085478.8596810118667983511.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
Strengthen the rmap btree record checker a little more by comparing
OWN_INOBT reverse mappings against the inode btrees.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
fs/xfs/scrub/rmap.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/fs/xfs/scrub/rmap.c b/fs/xfs/scrub/rmap.c
index 20a6905c2f0d..fcda958ce1af 100644
--- a/fs/xfs/scrub/rmap.c
+++ b/fs/xfs/scrub/rmap.c
@@ -18,6 +18,7 @@
#include "xfs_bit.h"
#include "xfs_alloc.h"
#include "xfs_alloc_btree.h"
+#include "xfs_ialloc_btree.h"
#include "scrub/scrub.h"
#include "scrub/common.h"
#include "scrub/btree.h"
@@ -56,6 +57,7 @@ struct xchk_rmap {
struct xbitmap fs_owned;
struct xbitmap log_owned;
struct xbitmap ag_owned;
+ struct xbitmap inobt_owned;
/* Did we complete the AG space metadata bitmaps? */
bool bitmaps_complete;
@@ -247,6 +249,9 @@ xchk_rmapbt_mark_bitmap(
case XFS_RMAP_OWN_AG:
bmp = &cr->ag_owned;
break;
+ case XFS_RMAP_OWN_INOBT:
+ bmp = &cr->inobt_owned;
+ break;
}
if (!bmp)
@@ -461,6 +466,34 @@ xchk_rmapbt_walk_ag_metadata(
error = xfs_agfl_walk(sc->mp, agf, agfl_bp, xchk_rmapbt_walk_agfl,
&cr->ag_owned);
xfs_trans_brelse(sc->tp, agfl_bp);
+ if (error)
+ goto out;
+
+ /* OWN_INOBT: inobt, finobt */
+ cur = sc->sa.ino_cur;
+ if (!cur)
+ cur = xfs_inobt_init_cursor(sc->mp, sc->tp, sc->sa.agi_bp,
+ sc->sa.pag, XFS_BTNUM_INO);
+ error = xfs_btree_visit_blocks(cur, xchk_rmapbt_visit_btblock,
+ XFS_BTREE_VISIT_ALL, &cr->inobt_owned);
+ if (cur != sc->sa.ino_cur)
+ xfs_btree_del_cursor(cur, error);
+ if (error)
+ goto out;
+
+ if (xfs_has_finobt(sc->mp)) {
+ cur = sc->sa.fino_cur;
+ if (!cur)
+ cur = xfs_inobt_init_cursor(sc->mp, sc->tp,
+ sc->sa.agi_bp, sc->sa.pag,
+ XFS_BTNUM_FINO);
+ error = xfs_btree_visit_blocks(cur, xchk_rmapbt_visit_btblock,
+ XFS_BTREE_VISIT_ALL, &cr->inobt_owned);
+ if (cur != sc->sa.fino_cur)
+ xfs_btree_del_cursor(cur, error);
+ if (error)
+ goto out;
+ }
out:
/*
@@ -506,6 +539,9 @@ xchk_rmapbt_check_bitmaps(
if (xbitmap_hweight(&cr->ag_owned) != 0)
xchk_btree_xref_set_corrupt(sc, cur, level);
+
+ if (xbitmap_hweight(&cr->inobt_owned) != 0)
+ xchk_btree_xref_set_corrupt(sc, cur, level);
}
/* Scrub the rmap btree for some AG. */
@@ -523,6 +559,7 @@ xchk_rmapbt(
xbitmap_init(&cr->fs_owned);
xbitmap_init(&cr->log_owned);
xbitmap_init(&cr->ag_owned);
+ xbitmap_init(&cr->inobt_owned);
error = xchk_rmapbt_walk_ag_metadata(sc, cr);
if (error)
@@ -536,6 +573,7 @@ xchk_rmapbt(
xchk_rmapbt_check_bitmaps(sc, cr);
out:
+ xbitmap_destroy(&cr->inobt_owned);
xbitmap_destroy(&cr->ag_owned);
xbitmap_destroy(&cr->log_owned);
xbitmap_destroy(&cr->fs_owned);
next prev parent reply other threads:[~2022-10-02 18:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-02 18:20 [PATCHSET v23.1 0/4] xfs: strengthen rmapbt scrubbing Darrick J. Wong
2022-10-02 18:20 ` [PATCH 1/4] xfs: cross-reference rmap records with ag btrees Darrick J. Wong
2022-10-02 18:20 ` Darrick J. Wong [this message]
2022-10-02 18:20 ` [PATCH 2/4] xfs: cross-reference rmap records with free space btrees Darrick J. Wong
2022-10-02 18:20 ` [PATCH 4/4] xfs: cross-reference rmap records with refcount btrees Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=166473484793.1085478.2493682708372844356.stgit@magnolia \
--to=djwong@kernel.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).