Commit 576af732 authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: convert btree cursor ag-private member name 



bc_private.a -> bc_ag conversion via script:

`sed -i 's/bc_private\.a/bc_ag/g' fs/xfs/*[ch] fs/xfs/*/*[ch]`

And then revert the change to the bc_ag #define in
fs/xfs/libxfs/xfs_btree.h manually.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 7cace18a

fs/xfs/libxfs/xfs_alloc.c

+8 −8
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ xfs_alloc_lookup_eq( 
	cur->bc_rec.a.ar_startblock = bno;

	cur->bc_rec.a.ar_blockcount = len;

	error = xfs_btree_lookup(cur, XFS_LOOKUP_EQ, stat);

	cur->bc_private.a.priv.abt.active = (*stat == 1);

	cur->bc_ag.priv.abt.active = (*stat == 1);

	return error;

}
@@ -171,7 +171,7 @@ xfs_alloc_lookup_ge( 
	cur->bc_rec.a.ar_startblock = bno;

	cur->bc_rec.a.ar_blockcount = len;

	error = xfs_btree_lookup(cur, XFS_LOOKUP_GE, stat);

	cur->bc_private.a.priv.abt.active = (*stat == 1);

	cur->bc_ag.priv.abt.active = (*stat == 1);

	return error;

}
@@ -190,7 +190,7 @@ xfs_alloc_lookup_le( 
	cur->bc_rec.a.ar_startblock = bno;

	cur->bc_rec.a.ar_blockcount = len;

	error = xfs_btree_lookup(cur, XFS_LOOKUP_LE, stat);

	cur->bc_private.a.priv.abt.active = (*stat == 1);

	cur->bc_ag.priv.abt.active = (*stat == 1);

	return error;

}
@@ -198,7 +198,7 @@ static inline bool 
xfs_alloc_cur_active(

	struct xfs_btree_cur	*cur)

{

	return cur && cur->bc_private.a.priv.abt.active;

	return cur && cur->bc_ag.priv.abt.active;

}



/*
@@ -230,7 +230,7 @@ xfs_alloc_get_rec( 
	int			*stat)	/* output: success/failure */

{

	struct xfs_mount	*mp = cur->bc_mp;

	xfs_agnumber_t		agno = cur->bc_private.a.agno;

	xfs_agnumber_t		agno = cur->bc_ag.agno;

	union xfs_btree_rec	*rec;

	int			error;
@@ -908,7 +908,7 @@ xfs_alloc_cur_check( 
		deactivate = true;

out:

	if (deactivate)

		cur->bc_private.a.priv.abt.active = false;

		cur->bc_ag.priv.abt.active = false;

	trace_xfs_alloc_cur_check(args->mp, cur->bc_btnum, bno, len, diff,

				  *new);

	return 0;
@@ -1352,7 +1352,7 @@ xfs_alloc_walk_iter( 
		if (error)

			return error;

		if (i == 0)

			cur->bc_private.a.priv.abt.active = false;

			cur->bc_ag.priv.abt.active = false;



		if (count > 0)

			count--;
@@ -1467,7 +1467,7 @@ xfs_alloc_ag_vextent_locality( 
		if (error)

			return error;

		if (i) {

			acur->cnt->bc_private.a.priv.abt.active = true;

			acur->cnt->bc_ag.priv.abt.active = true;

			fbcur = acur->cnt;

			fbinc = false;

		}

fs/xfs/libxfs/xfs_alloc_btree.c

+12 −12
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ xfs_allocbt_dup_cursor( 
	struct xfs_btree_cur	*cur)

{

	return xfs_allocbt_init_cursor(cur->bc_mp, cur->bc_tp,

			cur->bc_private.a.agbp, cur->bc_private.a.agno,

			cur->bc_ag.agbp, cur->bc_ag.agno,

			cur->bc_btnum);

}
@@ -35,7 +35,7 @@ xfs_allocbt_set_root( 
	union xfs_btree_ptr	*ptr,

	int			inc)

{

	struct xfs_buf		*agbp = cur->bc_private.a.agbp;

	struct xfs_buf		*agbp = cur->bc_ag.agbp;

	struct xfs_agf		*agf = agbp->b_addr;

	xfs_agnumber_t		seqno = be32_to_cpu(agf->agf_seqno);

	int			btnum = cur->bc_btnum;
@@ -62,7 +62,7 @@ xfs_allocbt_alloc_block( 
	xfs_agblock_t		bno;



	/* Allocate the new block from the freelist. If we can't, give up.  */

	error = xfs_alloc_get_freelist(cur->bc_tp, cur->bc_private.a.agbp,

	error = xfs_alloc_get_freelist(cur->bc_tp, cur->bc_ag.agbp,

				       &bno, 1);

	if (error)

		return error;
@@ -72,7 +72,7 @@ xfs_allocbt_alloc_block( 
		return 0;

	}



	xfs_extent_busy_reuse(cur->bc_mp, cur->bc_private.a.agno, bno, 1, false);

	xfs_extent_busy_reuse(cur->bc_mp, cur->bc_ag.agno, bno, 1, false);



	xfs_trans_agbtree_delta(cur->bc_tp, 1);

	new->s = cpu_to_be32(bno);
@@ -86,7 +86,7 @@ xfs_allocbt_free_block( 
	struct xfs_btree_cur	*cur,

	struct xfs_buf		*bp)

{

	struct xfs_buf		*agbp = cur->bc_private.a.agbp;

	struct xfs_buf		*agbp = cur->bc_ag.agbp;

	struct xfs_agf		*agf = agbp->b_addr;

	xfs_agblock_t		bno;

	int			error;
@@ -113,7 +113,7 @@ xfs_allocbt_update_lastrec( 
	int			ptr,

	int			reason)

{

	struct xfs_agf		*agf = cur->bc_private.a.agbp->b_addr;

	struct xfs_agf		*agf = cur->bc_ag.agbp->b_addr;

	xfs_agnumber_t		seqno = be32_to_cpu(agf->agf_seqno);

	struct xfs_perag	*pag;

	__be32			len;
@@ -162,7 +162,7 @@ xfs_allocbt_update_lastrec( 
	pag = xfs_perag_get(cur->bc_mp, seqno);

	pag->pagf_longest = be32_to_cpu(len);

	xfs_perag_put(pag);

	xfs_alloc_log_agf(cur->bc_tp, cur->bc_private.a.agbp, XFS_AGF_LONGEST);

	xfs_alloc_log_agf(cur->bc_tp, cur->bc_ag.agbp, XFS_AGF_LONGEST);

}



STATIC int
@@ -226,9 +226,9 @@ xfs_allocbt_init_ptr_from_cur( 
	struct xfs_btree_cur	*cur,

	union xfs_btree_ptr	*ptr)

{

	struct xfs_agf		*agf = cur->bc_private.a.agbp->b_addr;

	struct xfs_agf		*agf = cur->bc_ag.agbp->b_addr;



	ASSERT(cur->bc_private.a.agno == be32_to_cpu(agf->agf_seqno));

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



	ptr->s = agf->agf_roots[cur->bc_btnum];

}
@@ -505,9 +505,9 @@ xfs_allocbt_init_cursor( 
		cur->bc_nlevels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]);

	}



	cur->bc_private.a.agbp = agbp;

	cur->bc_private.a.agno = agno;

	cur->bc_private.a.priv.abt.active = false;

	cur->bc_ag.agbp = agbp;

	cur->bc_ag.agno = agno;

	cur->bc_ag.priv.abt.active = false;



	if (xfs_sb_version_hascrc(&mp->m_sb))

		cur->bc_flags |= XFS_BTREE_CRC_BLOCKS;

fs/xfs/libxfs/xfs_btree.c

+6 −6
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ xfs_btree_check_sptr( 
{

	if (level <= 0)

		return false;

	return xfs_verify_agbno(cur->bc_mp, cur->bc_private.a.agno, agbno);

	return xfs_verify_agbno(cur->bc_mp, cur->bc_ag.agno, agbno);

}



/*
@@ -243,7 +243,7 @@ xfs_btree_check_ptr( 
			return 0;

		xfs_err(cur->bc_mp,

"AG %u: Corrupt btree %d pointer at level %d index %d.",

				cur->bc_private.a.agno, cur->bc_btnum,

				cur->bc_ag.agno, cur->bc_btnum,

				level, index);

	}
@@ -881,13 +881,13 @@ xfs_btree_readahead_sblock( 




	if ((lr & XFS_BTCUR_LEFTRA) && left != NULLAGBLOCK) {

		xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.a.agno,

		xfs_btree_reada_bufs(cur->bc_mp, cur->bc_ag.agno,

				     left, 1, cur->bc_ops->buf_ops);

		rval++;

	}



	if ((lr & XFS_BTCUR_RIGHTRA) && right != NULLAGBLOCK) {

		xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.a.agno,

		xfs_btree_reada_bufs(cur->bc_mp, cur->bc_ag.agno,

				     right, 1, cur->bc_ops->buf_ops);

		rval++;

	}
@@ -945,7 +945,7 @@ xfs_btree_ptr_to_daddr( 
		*daddr = XFS_FSB_TO_DADDR(cur->bc_mp, fsbno);

	} else {

		agbno = be32_to_cpu(ptr->s);

		*daddr = XFS_AGB_TO_DADDR(cur->bc_mp, cur->bc_private.a.agno,

		*daddr = XFS_AGB_TO_DADDR(cur->bc_mp, cur->bc_ag.agno,

				agbno);

	}
@@ -1146,7 +1146,7 @@ xfs_btree_init_block_cur( 
	if (cur->bc_flags & XFS_BTREE_LONG_PTRS)

		owner = cur->bc_private.b.ip->i_ino;

	else

		owner = cur->bc_private.a.agno;

		owner = cur->bc_ag.agno;



	xfs_btree_init_block_int(cur->bc_mp, XFS_BUF_TO_BLOCK(bp), bp->b_bn,

				 cur->bc_btnum, level, numrecs,

fs/xfs/libxfs/xfs_ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ xfs_inobt_get_rec( 
	int				*stat)

{

	struct xfs_mount		*mp = cur->bc_mp;

	xfs_agnumber_t			agno = cur->bc_private.a.agno;

	xfs_agnumber_t			agno = cur->bc_ag.agno;

	union xfs_btree_rec		*rec;

	int				error;

	uint64_t			realfree;

fs/xfs/libxfs/xfs_ialloc_btree.c

+10 −10
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ xfs_inobt_dup_cursor( 
	struct xfs_btree_cur	*cur)

{

	return xfs_inobt_init_cursor(cur->bc_mp, cur->bc_tp,

			cur->bc_private.a.agbp, cur->bc_private.a.agno,

			cur->bc_ag.agbp, cur->bc_ag.agno,

			cur->bc_btnum);

}
@@ -44,7 +44,7 @@ xfs_inobt_set_root( 
	union xfs_btree_ptr	*nptr,

	int			inc)	/* level change */

{

	struct xfs_buf		*agbp = cur->bc_private.a.agbp;

	struct xfs_buf		*agbp = cur->bc_ag.agbp;

	struct xfs_agi		*agi = agbp->b_addr;



	agi->agi_root = nptr->s;
@@ -58,7 +58,7 @@ xfs_finobt_set_root( 
	union xfs_btree_ptr	*nptr,

	int			inc)	/* level change */

{

	struct xfs_buf		*agbp = cur->bc_private.a.agbp;

	struct xfs_buf		*agbp = cur->bc_ag.agbp;

	struct xfs_agi		*agi = agbp->b_addr;



	agi->agi_free_root = nptr->s;
@@ -83,7 +83,7 @@ __xfs_inobt_alloc_block( 
	args.tp = cur->bc_tp;

	args.mp = cur->bc_mp;

	args.oinfo = XFS_RMAP_OINFO_INOBT;

	args.fsbno = XFS_AGB_TO_FSB(args.mp, cur->bc_private.a.agno, sbno);

	args.fsbno = XFS_AGB_TO_FSB(args.mp, cur->bc_ag.agno, sbno);

	args.minlen = 1;

	args.maxlen = 1;

	args.prod = 1;
@@ -212,9 +212,9 @@ xfs_inobt_init_ptr_from_cur( 
	struct xfs_btree_cur	*cur,

	union xfs_btree_ptr	*ptr)

{

	struct xfs_agi		*agi = cur->bc_private.a.agbp->b_addr;

	struct xfs_agi		*agi = cur->bc_ag.agbp->b_addr;



	ASSERT(cur->bc_private.a.agno == be32_to_cpu(agi->agi_seqno));

	ASSERT(cur->bc_ag.agno == be32_to_cpu(agi->agi_seqno));



	ptr->s = agi->agi_root;

}
@@ -224,9 +224,9 @@ xfs_finobt_init_ptr_from_cur( 
	struct xfs_btree_cur	*cur,

	union xfs_btree_ptr	*ptr)

{

	struct xfs_agi		*agi = cur->bc_private.a.agbp->b_addr;

	struct xfs_agi		*agi = cur->bc_ag.agbp->b_addr;



	ASSERT(cur->bc_private.a.agno == be32_to_cpu(agi->agi_seqno));

	ASSERT(cur->bc_ag.agno == be32_to_cpu(agi->agi_seqno));

	ptr->s = agi->agi_free_root;

}
@@ -433,8 +433,8 @@ xfs_inobt_init_cursor( 
	if (xfs_sb_version_hascrc(&mp->m_sb))

		cur->bc_flags |= XFS_BTREE_CRC_BLOCKS;



	cur->bc_private.a.agbp = agbp;

	cur->bc_private.a.agno = agno;

	cur->bc_ag.agbp = agbp;

	cur->bc_ag.agno = agno;



	return cur;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE