From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Brian Foster <bfoster@redhat.com>
Cc: sandeen@sandeen.net, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 6/9] xfs_repair: check inode btree block counters in AGI
Date: Wed, 28 Oct 2020 18:01:15 -0700 [thread overview]
Message-ID: <20201029010115.GH1061252@magnolia> (raw)
In-Reply-To: <20201028172959.GE1611922@bfoster>
On Wed, Oct 28, 2020 at 01:29:59PM -0400, Brian Foster wrote:
> On Mon, Oct 26, 2020 at 04:33:44PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > Make sure that both inode btree block counters in the AGI are correct.
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > repair/scan.c | 38 +++++++++++++++++++++++++++++++++++---
> > 1 file changed, 35 insertions(+), 3 deletions(-)
> >
> >
> > diff --git a/repair/scan.c b/repair/scan.c
> > index 2a38ae5197c6..c826af7dee86 100644
> > --- a/repair/scan.c
> > +++ b/repair/scan.c
> ...
> > @@ -2022,6 +2029,17 @@ scan_inobt(
> > return;
> > }
> >
> > + switch (magic) {
> > + case XFS_FIBT_MAGIC:
> > + case XFS_FIBT_CRC_MAGIC:
> > + ipriv->fino_blocks++;
> > + break;
> > + case XFS_IBT_MAGIC:
> > + case XFS_IBT_CRC_MAGIC:
> > + ipriv->ino_blocks++;
> > + break;
> > + }
> > +
>
> Is this intentionally not folded into the earlier magic switch
> statement?
I'd originally thought that we wouldn't want to count the block if it's
obviously bad, but the tree and the agi counter are supposed to be
consistent with each other, so yes, we should always bump the counter
when we are pointed towards a block.
> > /*
> > * check for btree blocks multiply claimed, any unknown/free state
> > * is ok in the bitmap block.
> ...
> > @@ -2393,6 +2414,17 @@ validate_agi(
> > }
> > }
> >
> > + if (xfs_sb_version_hasinobtcounts(&mp->m_sb)) {
> > + if (be32_to_cpu(agi->agi_iblocks) != priv.ino_blocks)
> > + do_warn(_("bad inobt block count %u, saw %u\n"),
> > + priv.ino_blocks,
> > + be32_to_cpu(agi->agi_iblocks));
>
> These two params are backwards (here and below), no?
Oops. Good catch!
--D
> Brian
>
> > + if (be32_to_cpu(agi->agi_fblocks) != priv.fino_blocks)
> > + do_warn(_("bad finobt block count %u, saw %u\n"),
> > + priv.fino_blocks,
> > + be32_to_cpu(agi->agi_fblocks));
> > + }
> > +
> > if (be32_to_cpu(agi->agi_count) != agcnts->agicount) {
> > do_warn(_("agi_count %u, counted %u in ag %u\n"),
> > be32_to_cpu(agi->agi_count), agcnts->agicount, agno);
> >
>
next prev parent reply other threads:[~2020-10-29 1:03 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 23:33 [PATCH v4 0/9] xfsprogs: add a inode btree blocks counts to the AGI header Darrick J. Wong
2020-10-26 23:33 ` [PATCH 1/9] xfs: store inode btree block counts in " Darrick J. Wong
2020-10-26 23:33 ` [PATCH 2/9] xfs: use the finobt block counts to speed up mount times Darrick J. Wong
2020-10-26 23:33 ` [PATCH 3/9] xfs: support inode btree blockcounts in online repair Darrick J. Wong
2020-10-26 23:33 ` [PATCH 4/9] xfs_db: support displaying inode btree block counts in AGI header Darrick J. Wong
2020-10-28 17:28 ` Brian Foster
2020-10-26 23:33 ` [PATCH 5/9] xfs_db: add inobtcnt upgrade path Darrick J. Wong
2020-10-28 17:29 ` Brian Foster
2020-10-29 0:03 ` Darrick J. Wong
2020-10-29 12:09 ` Brian Foster
2020-10-29 15:42 ` Darrick J. Wong
2020-11-16 21:13 ` [PATCH v2 " Darrick J. Wong
2020-11-18 21:05 ` Eric Sandeen
2020-11-20 1:05 ` Darrick J. Wong
2020-11-20 4:10 ` Eric Sandeen
2020-10-26 23:33 ` [PATCH 6/9] xfs_repair: check inode btree block counters in AGI Darrick J. Wong
2020-10-28 17:29 ` Brian Foster
2020-10-29 1:01 ` Darrick J. Wong [this message]
2020-11-16 17:19 ` [PATCH v2 " Darrick J. Wong
2020-11-16 20:29 ` Eric Sandeen
2020-10-26 23:33 ` [PATCH 7/9] xfs_repair: regenerate " Darrick J. Wong
2020-10-28 17:30 ` Brian Foster
2020-10-26 23:33 ` [PATCH 8/9] mkfs: enable the inode btree counter feature Darrick J. Wong
2020-10-28 17:30 ` Brian Foster
2020-10-29 1:02 ` Darrick J. Wong
2020-10-26 23:34 ` [PATCH 9/9] xfs: enable new inode btree counters feature 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=20201029010115.GH1061252@magnolia \
--to=darrick.wong@oracle.com \
--cc=bfoster@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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