xfs: convert rmap btree cursor to using a perag (fa9c3c19) · Commits · EulixOS / Software / Kernel

fs/xfs/libxfs/xfs_ag.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -916,7 +916,7 @@ xfs_ag_extend_space(
		* XFS_RMAP_OINFO_SKIP_UPDATE is used here to tell the rmap btree that
		* this doesn't actually exist in the rmap btree.
		*/
		error = xfs_rmap_free(tp, bp, id->agno,
		error = xfs_rmap_free(tp, bp, bp->b_pag,
		be32_to_cpu(agf->agf_length) - len,
		len, &XFS_RMAP_OINFO_SKIP_UPDATE);
		if (error)

fs/xfs/libxfs/xfs_alloc.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -1092,7 +1092,7 @@ xfs_alloc_ag_vextent_small(
		* If we're feeding an AGFL block to something that doesn't live in the
		* free space, we need to clear out the OWN_AG rmap.
		*/
		error = xfs_rmap_free(args->tp, args->agbp, args->agno, fbno, 1,
		error = xfs_rmap_free(args->tp, args->agbp, args->pag, fbno, 1,
		&XFS_RMAP_OINFO_AG);
		if (error)
		goto error;
		@@ -1169,7 +1169,7 @@ xfs_alloc_ag_vextent(

		/* if not file data, insert new block into the reverse map btree */
		if (!xfs_rmap_should_skip_owner_update(&args->oinfo)) {
		error = xfs_rmap_alloc(args->tp, args->agbp, args->agno,
		error = xfs_rmap_alloc(args->tp, args->agbp, args->pag,
		args->agbno, args->len, &args->oinfo);
		if (error)
		return error;
		@@ -1899,12 +1899,13 @@ xfs_free_ag_extent(
		int haveright; /* have a right neighbor */
		int i;
		int error;
		struct xfs_perag *pag = agbp->b_pag;

		bno_cur = cnt_cur = NULL;
		mp = tp->t_mountp;

		if (!xfs_rmap_should_skip_owner_update(oinfo)) {
		error = xfs_rmap_free(tp, agbp, agno, bno, len, oinfo);
		error = xfs_rmap_free(tp, agbp, pag, bno, len, oinfo);
		if (error)
		goto error0;
		}

fs/xfs/libxfs/xfs_rmap.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -696,7 +696,7 @@ int
		xfs_rmap_free(
		struct xfs_trans *tp,
		struct xfs_buf *agbp,
		xfs_agnumber_t agno,
		struct xfs_perag *pag,
		xfs_agblock_t bno,
		xfs_extlen_t len,
		const struct xfs_owner_info *oinfo)
		@@ -708,7 +708,7 @@ xfs_rmap_free(
		if (!xfs_sb_version_hasrmapbt(&mp->m_sb))
		return 0;

		cur = xfs_rmapbt_init_cursor(mp, tp, agbp, agno, NULL);
		cur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag);

		error = xfs_rmap_unmap(cur, bno, len, false, oinfo);

		@@ -950,7 +950,7 @@ int
		xfs_rmap_alloc(
		struct xfs_trans *tp,
		struct xfs_buf *agbp,
		xfs_agnumber_t agno,
		struct xfs_perag *pag,
		xfs_agblock_t bno,
		xfs_extlen_t len,
		const struct xfs_owner_info *oinfo)
		@@ -962,7 +962,7 @@ xfs_rmap_alloc(
		if (!xfs_sb_version_hasrmapbt(&mp->m_sb))
		return 0;

		cur = xfs_rmapbt_init_cursor(mp, tp, agbp, agno, NULL);
		cur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag);
		error = xfs_rmap_map(cur, bno, len, false, oinfo);

		xfs_btree_del_cursor(cur, error);
		@@ -2408,7 +2408,7 @@ xfs_rmap_finish_one(
		goto out_drop;
		}

		rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag->pag_agno, pag);
		rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag);
		}
		*pcur = rcur;

fs/xfs/libxfs/xfs_rmap.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@
		#ifndef __XFS_RMAP_H__
		#define __XFS_RMAP_H__

		struct xfs_perag;

		static inline void
		xfs_rmap_ino_bmbt_owner(
		struct xfs_owner_info *oi,
		@@ -113,10 +115,10 @@ xfs_owner_info_pack(
		}

		int xfs_rmap_alloc(struct xfs_trans tp, struct xfs_buf agbp,
		xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len,
		struct xfs_perag *pag, xfs_agblock_t bno, xfs_extlen_t len,
		const struct xfs_owner_info *oinfo);
		int xfs_rmap_free(struct xfs_trans tp, struct xfs_buf agbp,
		xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len,
		struct xfs_perag *pag, xfs_agblock_t bno, xfs_extlen_t len,
		const struct xfs_owner_info *oinfo);

		int xfs_rmap_lookup_le(struct xfs_btree_cur *cur, xfs_agblock_t bno,

fs/xfs/libxfs/xfs_rmap_btree.c

+16 −21

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ xfs_rmapbt_dup_cursor(
		struct xfs_btree_cur *cur)
		{
		return xfs_rmapbt_init_cursor(cur->bc_mp, cur->bc_tp,
		cur->bc_ag.agbp, cur->bc_ag.agno, cur->bc_ag.pag);
		cur->bc_ag.agbp, cur->bc_ag.pag);
		}

		STATIC void
		@@ -64,13 +64,12 @@ xfs_rmapbt_set_root(
		struct xfs_buf *agbp = cur->bc_ag.agbp;
		struct xfs_agf *agf = agbp->b_addr;
		int btnum = cur->bc_btnum;
		struct xfs_perag *pag = agbp->b_pag;

		ASSERT(ptr->s != 0);

		agf->agf_roots[btnum] = ptr->s;
		be32_add_cpu(&agf->agf_levels[btnum], inc);
		pag->pagf_levels[btnum] += inc;
		cur->bc_ag.pag->pagf_levels[btnum] += inc;

		xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_ROOTS \| XFS_AGF_LEVELS);
		}
		@@ -84,6 +83,7 @@ xfs_rmapbt_alloc_block(
		{
		struct xfs_buf *agbp = cur->bc_ag.agbp;
		struct xfs_agf *agf = agbp->b_addr;
		struct xfs_perag *pag = cur->bc_ag.pag;
		int error;
		xfs_agblock_t bno;

		@@ -93,20 +93,19 @@ xfs_rmapbt_alloc_block(
		if (error)
		return error;

		trace_xfs_rmapbt_alloc_block(cur->bc_mp, cur->bc_ag.agno,
		bno, 1);
		trace_xfs_rmapbt_alloc_block(cur->bc_mp, pag->pag_agno, bno, 1);
		if (bno == NULLAGBLOCK) {
		*stat = 0;
		return 0;
		}

		xfs_extent_busy_reuse(cur->bc_mp, agbp->b_pag, bno, 1, false);
		xfs_extent_busy_reuse(cur->bc_mp, pag, bno, 1, false);

		new->s = cpu_to_be32(bno);
		be32_add_cpu(&agf->agf_rmap_blocks, 1);
		xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS);

		xfs_ag_resv_rmapbt_alloc(cur->bc_mp, cur->bc_ag.agno);
		xfs_ag_resv_rmapbt_alloc(cur->bc_mp, pag->pag_agno);

		*stat = 1;
		return 0;
		@@ -119,12 +118,12 @@ xfs_rmapbt_free_block(
		{
		struct xfs_buf *agbp = cur->bc_ag.agbp;
		struct xfs_agf *agf = agbp->b_addr;
		struct xfs_perag *pag;
		struct xfs_perag *pag = cur->bc_ag.pag;
		xfs_agblock_t bno;
		int error;

		bno = xfs_daddr_to_agbno(cur->bc_mp, XFS_BUF_ADDR(bp));
		trace_xfs_rmapbt_free_block(cur->bc_mp, cur->bc_ag.agno,
		trace_xfs_rmapbt_free_block(cur->bc_mp, pag->pag_agno,
		bno, 1);
		be32_add_cpu(&agf->agf_rmap_blocks, -1);
		xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS);
		@@ -132,7 +131,6 @@ xfs_rmapbt_free_block(
		if (error)
		return error;

		pag = cur->bc_ag.agbp->b_pag;
		xfs_extent_busy_insert(cur->bc_tp, pag, bno, 1,
		XFS_EXTENT_BUSY_SKIP_DISCARD);

		@@ -214,7 +212,7 @@ xfs_rmapbt_init_ptr_from_cur(
		{
		struct xfs_agf *agf = cur->bc_ag.agbp->b_addr;

		ASSERT(cur->bc_ag.agno == be32_to_cpu(agf->agf_seqno));
		ASSERT(cur->bc_ag.pag->pag_agno == be32_to_cpu(agf->agf_seqno));

		ptr->s = agf->agf_roots[cur->bc_btnum];
		}
		@@ -449,7 +447,6 @@ static struct xfs_btree_cur *
		xfs_rmapbt_init_common(
		struct xfs_mount *mp,
		struct xfs_trans *tp,
		xfs_agnumber_t agno,
		struct xfs_perag *pag)
		{
		struct xfs_btree_cur *cur;
		@@ -462,13 +459,12 @@ xfs_rmapbt_init_common(
		cur->bc_flags = XFS_BTREE_CRC_BLOCKS \| XFS_BTREE_OVERLAPPING;
		cur->bc_blocklog = mp->m_sb.sb_blocklog;
		cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_rmap_2);
		cur->bc_ag.agno = agno;
		cur->bc_ops = &xfs_rmapbt_ops;
		if (pag) {

		/* take a reference for the cursor */
		atomic_inc(&pag->pag_ref);
		}
		cur->bc_ag.pag = pag;
		cur->bc_ag.agno = pag->pag_agno;

		return cur;
		}
		@@ -479,13 +475,12 @@ xfs_rmapbt_init_cursor(
		struct xfs_mount *mp,
		struct xfs_trans *tp,
		struct xfs_buf *agbp,
		xfs_agnumber_t agno,
		struct xfs_perag *pag)
		{
		struct xfs_agf *agf = agbp->b_addr;
		struct xfs_btree_cur *cur;

		cur = xfs_rmapbt_init_common(mp, tp, agno, pag);
		cur = xfs_rmapbt_init_common(mp, tp, pag);
		cur->bc_nlevels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]);
		cur->bc_ag.agbp = agbp;
		return cur;
		@@ -496,11 +491,11 @@ struct xfs_btree_cur *
		xfs_rmapbt_stage_cursor(
		struct xfs_mount *mp,
		struct xbtree_afakeroot *afake,
		xfs_agnumber_t agno)
		struct xfs_perag *pag)
		{
		struct xfs_btree_cur *cur;

		cur = xfs_rmapbt_init_common(mp, NULL, agno, NULL);
		cur = xfs_rmapbt_init_common(mp, NULL, pag);
		xfs_btree_stage_afakeroot(cur, afake);
		return cur;
		}