Commit 50f02fe3 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: remove agno from btree cursor 



Now that everything passes a perag, the agno is not needed anymore.
Convert all the users to use pag->pag_agno instead and remove the
agno from the cursor. This was largely done as an automated search
and replace.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 7b13c515

fs/xfs/libxfs/xfs_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -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_ag.agno;

	xfs_agnumber_t		agno = cur->bc_ag.pag->pag_agno;

	union xfs_btree_rec	*rec;

	int			error;

fs/xfs/libxfs/xfs_alloc_btree.c

+0 −1
Original line number Diff line number Diff line
@@ -497,7 +497,6 @@ xfs_allocbt_init_common( 
	/* take a reference for the cursor */

	atomic_inc(&pag->pag_ref);

	cur->bc_ag.pag = pag;

	cur->bc_ag.agno = pag->pag_agno;



	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
@@ -216,7 +216,7 @@ xfs_btree_check_sptr( 
{

	if (level <= 0)

		return false;

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

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

}



/*
@@ -245,7 +245,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_ag.agno, cur->bc_btnum,

				cur->bc_ag.pag->pag_agno, cur->bc_btnum,

				level, index);

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




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

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

		xfs_btree_reada_bufs(cur->bc_mp, cur->bc_ag.pag->pag_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_ag.agno,

		xfs_btree_reada_bufs(cur->bc_mp, cur->bc_ag.pag->pag_agno,

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

		rval++;

	}
@@ -952,7 +952,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_ag.agno,

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

				agbno);

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

		owner = cur->bc_ino.ip->i_ino;

	else

		owner = cur->bc_ag.agno;

		owner = cur->bc_ag.pag->pag_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_btree.h

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ union xfs_btree_irec { 


/* Per-AG btree information. */

struct xfs_btree_cur_ag {

	xfs_agnumber_t		agno;

	struct xfs_perag	*pag;

	union {

		struct xfs_buf		*agbp;

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_ag.agno;

	xfs_agnumber_t			agno = cur->bc_ag.pag->pag_agno;

	union xfs_btree_rec		*rec;

	int				error;

	uint64_t			realfree;