From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from aserp2130.oracle.com ([141.146.126.79]:41924 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750772AbeEPRAj (ORCPT ); Wed, 16 May 2018 13:00:39 -0400 Subject: Re: [PATCH 02/22] xfs: add helpers to allocate and initialize fresh btree roots References: <152642361893.1556.9335169821674946249.stgit@magnolia> <152642363169.1556.14593532407537096653.stgit@magnolia> From: Allison Henderson Message-ID: <38ce2aaa-8acb-0d56-28b9-465415db39aa@oracle.com> Date: Wed, 16 May 2018 10:00:33 -0700 MIME-Version: 1.0 In-Reply-To: <152642363169.1556.14593532407537096653.stgit@magnolia> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org, david@fromorbit.com Alrighty, you can add my review: Reviewed by: Allison Henderson Thx! On 05/15/2018 03:33 PM, Darrick J. Wong wrote: > From: Darrick J. Wong > > Add a pair of helper functions to allocate and initialize fresh btree > roots. The repair functions will use these as part of recreating > corrupted metadata. > > Signed-off-by: Darrick J. Wong > --- > fs/xfs/scrub/repair.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ > fs/xfs/scrub/repair.h | 6 ++++ > 2 files changed, 87 insertions(+) > > > diff --git a/fs/xfs/scrub/repair.c b/fs/xfs/scrub/repair.c > index 486e6e319b1f..72f04a717150 100644 > --- a/fs/xfs/scrub/repair.c > +++ b/fs/xfs/scrub/repair.c > @@ -280,3 +280,84 @@ xfs_repair_calc_ag_resblks( > > return max(max(bnobt_sz, inobt_sz), max(rmapbt_sz, refcbt_sz)); > } > + > +/* Allocate a block in an AG. */ > +int > +xfs_repair_alloc_ag_block( > + struct xfs_scrub_context *sc, > + struct xfs_owner_info *oinfo, > + xfs_fsblock_t *fsbno, > + enum xfs_ag_resv_type resv) > +{ > + struct xfs_alloc_arg args = {0}; > + xfs_agblock_t bno; > + int error; > + > + switch (resv) { > + case XFS_AG_RESV_AGFL: > + case XFS_AG_RESV_RMAPBT: > + error = xfs_alloc_get_freelist(sc->tp, sc->sa.agf_bp, &bno, 1); > + if (error) > + return error; > + if (bno == NULLAGBLOCK) > + return -ENOSPC; > + xfs_extent_busy_reuse(sc->mp, sc->sa.agno, bno, > + 1, false); > + *fsbno = XFS_AGB_TO_FSB(sc->mp, sc->sa.agno, bno); > + if (resv == XFS_AG_RESV_RMAPBT) > + xfs_ag_resv_rmapbt_alloc(sc->mp, sc->sa.agno); > + return 0; > + default: > + break; > + } > + > + args.tp = sc->tp; > + args.mp = sc->mp; > + args.oinfo = *oinfo; > + args.fsbno = XFS_AGB_TO_FSB(args.mp, sc->sa.agno, 0); > + args.minlen = 1; > + args.maxlen = 1; > + args.prod = 1; > + args.type = XFS_ALLOCTYPE_THIS_AG; > + args.resv = resv; > + > + error = xfs_alloc_vextent(&args); > + if (error) > + return error; > + if (args.fsbno == NULLFSBLOCK) > + return -ENOSPC; > + ASSERT(args.len == 1); > + *fsbno = args.fsbno; > + > + return 0; > +} > + > +/* Initialize a new AG btree root block with zero entries. */ > +int > +xfs_repair_init_btblock( > + struct xfs_scrub_context *sc, > + xfs_fsblock_t fsb, > + struct xfs_buf **bpp, > + xfs_btnum_t btnum, > + const struct xfs_buf_ops *ops) > +{ > + struct xfs_trans *tp = sc->tp; > + struct xfs_mount *mp = sc->mp; > + struct xfs_buf *bp; > + > + trace_xfs_repair_init_btblock(mp, XFS_FSB_TO_AGNO(mp, fsb), > + XFS_FSB_TO_AGBNO(mp, fsb), btnum); > + > + ASSERT(XFS_FSB_TO_AGNO(mp, fsb) == sc->sa.agno); > + bp = xfs_trans_get_buf(tp, mp->m_ddev_targp, XFS_FSB_TO_DADDR(mp, fsb), > + XFS_FSB_TO_BB(mp, 1), 0); > + xfs_buf_zero(bp, 0, BBTOB(bp->b_length)); > + xfs_btree_init_block(mp, bp, btnum, 0, 0, sc->sa.agno, > + XFS_BTREE_CRC_BLOCKS); > + xfs_trans_buf_set_type(tp, bp, XFS_BLFT_BTREE_BUF); > + xfs_trans_log_buf(tp, bp, 0, bp->b_length); > + bp->b_ops = ops; > + *bpp = bp; > + > + return 0; > +} > diff --git a/fs/xfs/scrub/repair.h b/fs/xfs/scrub/repair.h > index 8d181dce6171..40990fa5f381 100644 > --- a/fs/xfs/scrub/repair.h > +++ b/fs/xfs/scrub/repair.h > @@ -36,6 +36,12 @@ int xfs_repair_roll_ag_trans(struct xfs_scrub_context *sc); > bool xfs_repair_ag_has_space(struct xfs_perag *pag, xfs_extlen_t nr_blocks, > enum xfs_ag_resv_type type); > xfs_extlen_t xfs_repair_calc_ag_resblks(struct xfs_scrub_context *sc); > +int xfs_repair_alloc_ag_block(struct xfs_scrub_context *sc, > + struct xfs_owner_info *oinfo, xfs_fsblock_t *fsbno, > + enum xfs_ag_resv_type resv); > +int xfs_repair_init_btblock(struct xfs_scrub_context *sc, xfs_fsblock_t fsb, > + struct xfs_buf **bpp, xfs_btnum_t btnum, > + const struct xfs_buf_ops *ops); > > /* Metadata repairers */ > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at https://urldefense.proofpoint.com/v2/url?u=http-3A__vger.kernel.org_majordomo-2Dinfo.html&d=DwICaQ&c=RoP1YumCXCgaWHvlZYR8PZh8Bv7qIrMUB65eapI_JnE&r=LHZQ8fHvy6wDKXGTWcm97burZH5sQKHRDMaY1UthQxc&m=4QHdmNFIP7trSueA8XyY8TjPFBlv0bJ8UpmheOu6zJA&s=nvq_2KNHpSbVaDCf2vQai6hS8Pkmm8mnLSLrA8erFCk&e=