From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 4/5] xfs: support inode btree blockcounts in online repair
Date: Wed, 2 Sep 2020 09:23:49 -0400 [thread overview]
Message-ID: <20200902132349.GB289426@bfoster> (raw)
In-Reply-To: <159901537765.547164.7777551130535148618.stgit@magnolia>
On Tue, Sep 01, 2020 at 07:56:17PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Add the necessary bits to the online repair code to support logging the
> inode btree counters when rebuilding the btrees, and to support fixing
> the counters when rebuilding the AGI.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_ialloc_btree.c | 16 +++++++++++++---
> fs/xfs/scrub/agheader_repair.c | 24 ++++++++++++++++++++++++
> 2 files changed, 37 insertions(+), 3 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c
> index 1df04e48bd87..219f57f4b5a7 100644
> --- a/fs/xfs/libxfs/xfs_ialloc_btree.c
> +++ b/fs/xfs/libxfs/xfs_ialloc_btree.c
> @@ -504,19 +504,29 @@ xfs_inobt_commit_staged_btree(
> {
> struct xfs_agi *agi = agbp->b_addr;
> struct xbtree_afakeroot *afake = cur->bc_ag.afake;
> + int fields;
>
> ASSERT(cur->bc_flags & XFS_BTREE_STAGING);
>
> if (cur->bc_btnum == XFS_BTNUM_INO) {
> + fields = XFS_AGI_ROOT | XFS_AGI_LEVEL;
> agi->agi_root = cpu_to_be32(afake->af_root);
> agi->agi_level = cpu_to_be32(afake->af_levels);
> - xfs_ialloc_log_agi(tp, agbp, XFS_AGI_ROOT | XFS_AGI_LEVEL);
> + if (xfs_sb_version_hasinobtcounts(&cur->bc_mp->m_sb)) {
> + agi->agi_iblocks = cpu_to_be32(afake->af_blocks);
> + fields |= XFS_AGI_IBLOCKS;
> + }
> + xfs_ialloc_log_agi(tp, agbp, fields);
> xfs_btree_commit_afakeroot(cur, tp, agbp, &xfs_inobt_ops);
> } else {
> + fields = XFS_AGI_FREE_ROOT | XFS_AGI_FREE_LEVEL;
> agi->agi_free_root = cpu_to_be32(afake->af_root);
> agi->agi_free_level = cpu_to_be32(afake->af_levels);
> - xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREE_ROOT |
> - XFS_AGI_FREE_LEVEL);
> + if (xfs_sb_version_hasinobtcounts(&cur->bc_mp->m_sb)) {
> + agi->agi_fblocks = cpu_to_be32(afake->af_blocks);
> + fields |= XFS_AGI_IBLOCKS;
> + }
> + xfs_ialloc_log_agi(tp, agbp, fields);
> xfs_btree_commit_afakeroot(cur, tp, agbp, &xfs_finobt_ops);
> }
> }
> diff --git a/fs/xfs/scrub/agheader_repair.c b/fs/xfs/scrub/agheader_repair.c
> index bca2ab1d4be9..401f71579ce6 100644
> --- a/fs/xfs/scrub/agheader_repair.c
> +++ b/fs/xfs/scrub/agheader_repair.c
> @@ -810,10 +810,34 @@ xrep_agi_calc_from_btrees(
> error = xfs_ialloc_count_inodes(cur, &count, &freecount);
> if (error)
> goto err;
> + if (xfs_sb_version_hasinobtcounts(&mp->m_sb)) {
> + xfs_agblock_t blocks;
> +
> + error = xfs_btree_count_blocks(cur, &blocks);
> + if (error)
> + goto err;
> + agi->agi_iblocks = cpu_to_be32(blocks);
> + }
> xfs_btree_del_cursor(cur, error);
>
> agi->agi_count = cpu_to_be32(count);
> agi->agi_freecount = cpu_to_be32(freecount);
> +
> + if (xfs_sb_version_hasfinobt(&mp->m_sb) &&
> + xfs_sb_version_hasinobtcounts(&mp->m_sb)) {
> + xfs_agblock_t blocks;
> +
> + cur = xfs_inobt_init_cursor(mp, sc->tp, agi_bp, sc->sa.agno,
> + XFS_BTNUM_FINO);
> + if (error)
> + goto err;
> + error = xfs_btree_count_blocks(cur, &blocks);
> + if (error)
> + goto err;
> + xfs_btree_del_cursor(cur, error);
> + agi->agi_fblocks = cpu_to_be32(blocks);
> + }
> +
> return 0;
> err:
> xfs_btree_del_cursor(cur, error);
>
next prev parent reply other threads:[~2020-09-02 13:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 2:55 [PATCH v4 0/5] xfs: add inode btree blocks counters to the AGI header Darrick J. Wong
2020-09-02 2:55 ` [PATCH 1/5] xfs: store inode btree block counts in " Darrick J. Wong
2020-09-02 13:23 ` Brian Foster
2020-09-02 17:13 ` Darrick J. Wong
2020-09-02 2:56 ` [PATCH 2/5] xfs: use the finobt block counts to speed up mount times Darrick J. Wong
2020-09-02 2:56 ` [PATCH 3/5] xfs: support inode btree blockcounts in online scrub Darrick J. Wong
2020-09-02 2:56 ` [PATCH 4/5] xfs: support inode btree blockcounts in online repair Darrick J. Wong
2020-09-02 13:23 ` Brian Foster [this message]
2020-09-02 2:56 ` [PATCH 5/5] xfs: enable new inode btree counters feature Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2020-08-28 2:36 [PATCH v3 0/5] xfs: add inode btree blocks counters to the AGI header Darrick J. Wong
2020-08-28 2:36 ` [PATCH 4/5] xfs: support inode btree blockcounts in online repair Darrick J. Wong
2020-08-31 19:07 ` Brian Foster
2020-08-31 19:40 ` 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=20200902132349.GB289426@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.com \
--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