Commit 9798f615 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove XFS_BUF_TO_AGF 



Just dereference bp->b_addr directly and make the code a little
simpler and more clear.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 370c782b

fs/xfs/libxfs/xfs_ag.c

+3 −3
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ xfs_agfblock_init( 
	struct xfs_buf		*bp,

	struct aghdr_init_data	*id)

{

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(bp);

	struct xfs_agf		*agf = bp->b_addr;

	xfs_extlen_t		tmpsize;



	agf->agf_magicnum = cpu_to_be32(XFS_AGF_MAGIC);
@@ -515,7 +515,7 @@ xfs_ag_extend_space( 
	if (error)

		return error;



	agf = XFS_BUF_TO_AGF(bp);

	agf = bp->b_addr;

	be32_add_cpu(&agf->agf_length, len);

	ASSERT(agf->agf_length == agi->agi_length);

	xfs_alloc_log_agf(tp, bp, XFS_AGF_LENGTH);
@@ -573,7 +573,7 @@ xfs_ag_get_geometry( 
	ageo->ag_icount = be32_to_cpu(agi->agi_count);

	ageo->ag_ifree = be32_to_cpu(agi->agi_freecount);



	agf = XFS_BUF_TO_AGF(agf_bp);

	agf = agf_bp->b_addr;

	ageo->ag_length = be32_to_cpu(agf->agf_length);

	freeblks = pag->pagf_freeblks +

		   pag->pagf_flcount +

fs/xfs/libxfs/xfs_alloc.c

+23 −29
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ xfs_alloc_update_counters( 
	struct xfs_buf		*agbp,

	long			len)

{

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(agbp);

	struct xfs_agf		*agf = agbp->b_addr;



	pag->pagf_freeblks += len;

	be32_add_cpu(&agf->agf_freeblks, len);
@@ -923,13 +923,13 @@ xfs_alloc_cur_finish( 
	struct xfs_alloc_arg	*args,

	struct xfs_alloc_cur	*acur)

{

	struct xfs_agf __maybe_unused *agf = args->agbp->b_addr;

	int			error;



	ASSERT(acur->cnt && acur->bnolt);

	ASSERT(acur->bno >= acur->rec_bno);

	ASSERT(acur->bno + acur->len <= acur->rec_bno + acur->rec_len);

	ASSERT(acur->rec_bno + acur->rec_len <=

	       be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));

	ASSERT(acur->rec_bno + acur->rec_len <= be32_to_cpu(agf->agf_length));



	error = xfs_alloc_fixup_trees(acur->cnt, acur->bnolt, acur->rec_bno,

				      acur->rec_len, acur->bno, acur->len, 0);
@@ -1027,6 +1027,7 @@ xfs_alloc_ag_vextent_small( 
	xfs_extlen_t		*flenp,	/* result length */

	int			*stat)	/* status: 0-freelist, 1-normal/none */

{

	struct xfs_agf		*agf = args->agbp->b_addr;

	int			error = 0;

	xfs_agblock_t		fbno = NULLAGBLOCK;

	xfs_extlen_t		flen = 0;
@@ -1055,8 +1056,7 @@ xfs_alloc_ag_vextent_small( 


	if (args->minlen != 1 || args->alignment != 1 ||

	    args->resv == XFS_AG_RESV_AGFL ||

	    (be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_flcount) <=

	     args->minleft))

	    be32_to_cpu(agf->agf_flcount) <= args->minleft)

		goto out;



	error = xfs_alloc_get_freelist(args->tp, args->agbp, &fbno, 0);
@@ -1080,9 +1080,7 @@ xfs_alloc_ag_vextent_small( 
	}

	*fbnop = args->agbno = fbno;

	*flenp = args->len = 1;

	if (XFS_IS_CORRUPT(args->mp,

			   fbno >= be32_to_cpu(

				   XFS_BUF_TO_AGF(args->agbp)->agf_length))) {

	if (XFS_IS_CORRUPT(args->mp, fbno >= be32_to_cpu(agf->agf_length))) {

		error = -EFSCORRUPTED;

		goto error;

	}
@@ -1204,6 +1202,7 @@ STATIC int /* error */ 
xfs_alloc_ag_vextent_exact(

	xfs_alloc_arg_t	*args)	/* allocation argument structure */

{

	struct xfs_agf __maybe_unused *agf = args->agbp->b_addr;

	xfs_btree_cur_t	*bno_cur;/* by block-number btree cursor */

	xfs_btree_cur_t	*cnt_cur;/* by count btree cursor */

	int		error;
@@ -1282,8 +1281,7 @@ xfs_alloc_ag_vextent_exact( 
	 */

	cnt_cur = xfs_allocbt_init_cursor(args->mp, args->tp, args->agbp,

		args->agno, XFS_BTNUM_CNT);

	ASSERT(args->agbno + args->len <=

		be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));

	ASSERT(args->agbno + args->len <= be32_to_cpu(agf->agf_length));

	error = xfs_alloc_fixup_trees(cnt_cur, bno_cur, fbno, flen, args->agbno,

				      args->len, XFSA_FIXUP_BNO_OK);

	if (error) {
@@ -1662,6 +1660,7 @@ STATIC int /* error */ 
xfs_alloc_ag_vextent_size(

	xfs_alloc_arg_t	*args)		/* allocation argument structure */

{

	struct xfs_agf	*agf = args->agbp->b_addr;

	xfs_btree_cur_t	*bno_cur;	/* cursor for bno btree */

	xfs_btree_cur_t	*cnt_cur;	/* cursor for cnt btree */

	int		error;		/* error result */
@@ -1852,8 +1851,7 @@ xfs_alloc_ag_vextent_size( 
	args->agbno = rbno;

	if (XFS_IS_CORRUPT(args->mp,

			   args->agbno + args->len >

			   be32_to_cpu(

				   XFS_BUF_TO_AGF(args->agbp)->agf_length))) {

			   be32_to_cpu(agf->agf_length))) {

		error = -EFSCORRUPTED;

		goto error0;

	}
@@ -2425,7 +2423,7 @@ xfs_agfl_reset( 
	struct xfs_perag	*pag)

{

	struct xfs_mount	*mp = tp->t_mountp;

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(agbp);

	struct xfs_agf		*agf = agbp->b_addr;



	ASSERT(pag->pagf_agflreset);

	trace_xfs_agfl_reset(mp, agf, 0, _RET_IP_);
@@ -2656,7 +2654,7 @@ xfs_alloc_get_freelist( 
	xfs_agblock_t	*bnop,	/* block address retrieved from freelist */

	int		btreeblk) /* destination is a AGF btree */

{

	xfs_agf_t	*agf;	/* a.g. freespace structure */

	struct xfs_agf	*agf = agbp->b_addr;

	xfs_buf_t	*agflbp;/* buffer for a.g. freelist structure */

	xfs_agblock_t	bno;	/* block number returned */

	__be32		*agfl_bno;
@@ -2668,7 +2666,6 @@ xfs_alloc_get_freelist( 
	/*

	 * Freelist is empty, give up.

	 */

	agf = XFS_BUF_TO_AGF(agbp);

	if (!agf->agf_flcount) {

		*bnop = NULLAGBLOCK;

		return 0;
@@ -2746,7 +2743,7 @@ xfs_alloc_log_agf( 
		sizeof(xfs_agf_t)

	};



	trace_xfs_agf(tp->t_mountp, XFS_BUF_TO_AGF(bp), fields, _RET_IP_);

	trace_xfs_agf(tp->t_mountp, bp->b_addr, fields, _RET_IP_);



	xfs_trans_buf_set_type(tp, bp, XFS_BLFT_AGF_BUF);
@@ -2784,18 +2781,15 @@ xfs_alloc_put_freelist( 
	xfs_agblock_t		bno,	/* block being freed */

	int			btreeblk) /* block came from a AGF btree */

{

	xfs_agf_t		*agf;	/* a.g. freespace structure */

	struct xfs_mount	*mp = tp->t_mountp;

	struct xfs_agf		*agf = agbp->b_addr;

	__be32			*blockp;/* pointer to array entry */

	int			error;

	int			logflags;

	xfs_mount_t		*mp;	/* mount structure */

	xfs_perag_t		*pag;	/* per allocation group data */

	__be32			*agfl_bno;

	int			startoff;



	agf = XFS_BUF_TO_AGF(agbp);

	mp = tp->t_mountp;



	if (!agflbp && (error = xfs_alloc_read_agfl(mp, tp,

			be32_to_cpu(agf->agf_seqno), &agflbp)))

		return error;
@@ -2839,13 +2833,12 @@ xfs_agf_verify( 
	struct xfs_buf		*bp)

{

	struct xfs_mount	*mp = bp->b_mount;

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(bp);

	struct xfs_agf		*agf = bp->b_addr;



	if (xfs_sb_version_hascrc(&mp->m_sb)) {

		if (!uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))

			return __this_address;

		if (!xfs_log_check_lsn(mp,

				be64_to_cpu(XFS_BUF_TO_AGF(bp)->agf_lsn)))

		if (!xfs_log_check_lsn(mp, be64_to_cpu(agf->agf_lsn)))

			return __this_address;

	}
@@ -2931,6 +2924,7 @@ xfs_agf_write_verify( 
{

	struct xfs_mount	*mp = bp->b_mount;

	struct xfs_buf_log_item	*bip = bp->b_log_item;

	struct xfs_agf		*agf = bp->b_addr;

	xfs_failaddr_t		fa;



	fa = xfs_agf_verify(bp);
@@ -2943,7 +2937,7 @@ xfs_agf_write_verify( 
		return;



	if (bip)

		XFS_BUF_TO_AGF(bp)->agf_lsn = cpu_to_be64(bip->bli_item.li_lsn);

		agf->agf_lsn = cpu_to_be64(bip->bli_item.li_lsn);



	xfs_buf_update_cksum(bp, XFS_AGF_CRC_OFF);

}
@@ -3011,7 +3005,7 @@ xfs_alloc_read_agf( 
		return error;

	ASSERT(!(*bpp)->b_error);



	agf = XFS_BUF_TO_AGF(*bpp);

	agf = (*bpp)->b_addr;

	pag = xfs_perag_get(mp, agno);

	if (!pag->pagf_init) {

		pag->pagf_freeblks = be32_to_cpu(agf->agf_freeblks);
@@ -3292,6 +3286,7 @@ __xfs_free_extent( 
	struct xfs_buf			*agbp;

	xfs_agnumber_t			agno = XFS_FSB_TO_AGNO(mp, bno);

	xfs_agblock_t			agbno = XFS_FSB_TO_AGBNO(mp, bno);

	struct xfs_agf			*agf;

	int				error;

	unsigned int			busy_flags = 0;
@@ -3305,6 +3300,7 @@ __xfs_free_extent( 
	error = xfs_free_extent_fix_freelist(tp, agno, &agbp);

	if (error)

		return error;

	agf = agbp->b_addr;



	if (XFS_IS_CORRUPT(mp, agbno >= mp->m_sb.sb_agblocks)) {

		error = -EFSCORRUPTED;
@@ -3312,9 +3308,7 @@ __xfs_free_extent( 
	}



	/* validate the extent size is legal now we have the agf locked */

	if (XFS_IS_CORRUPT(mp,

			   agbno + len >

			   be32_to_cpu(XFS_BUF_TO_AGF(agbp)->agf_length))) {

	if (XFS_IS_CORRUPT(mp, agbno + len > be32_to_cpu(agf->agf_length))) {

		error = -EFSCORRUPTED;

		goto err;

	}

fs/xfs/libxfs/xfs_alloc_btree.c

+5 −5
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ xfs_allocbt_set_root( 
	int			inc)

{

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

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(agbp);

	struct xfs_agf		*agf = agbp->b_addr;

	xfs_agnumber_t		seqno = be32_to_cpu(agf->agf_seqno);

	int			btnum = cur->bc_btnum;

	struct xfs_perag	*pag = xfs_perag_get(cur->bc_mp, seqno);
@@ -87,7 +87,7 @@ xfs_allocbt_free_block( 
	struct xfs_buf		*bp)

{

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

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(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 = XFS_BUF_TO_AGF(cur->bc_private.a.agbp);

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

	xfs_agnumber_t		seqno = be32_to_cpu(agf->agf_seqno);

	struct xfs_perag	*pag;

	__be32			len;
@@ -226,7 +226,7 @@ xfs_allocbt_init_ptr_from_cur( 
	struct xfs_btree_cur	*cur,

	union xfs_btree_ptr	*ptr)

{

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(cur->bc_private.a.agbp);

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



	ASSERT(cur->bc_private.a.agno == be32_to_cpu(agf->agf_seqno));
@@ -482,7 +482,7 @@ xfs_allocbt_init_cursor( 
	xfs_agnumber_t		agno,		/* allocation group number */

	xfs_btnum_t		btnum)		/* btree identifier */

{

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(agbp);

	struct xfs_agf		*agf = agbp->b_addr;

	struct xfs_btree_cur	*cur;



	ASSERT(btnum == XFS_BTNUM_BNO || btnum == XFS_BTNUM_CNT);

fs/xfs/libxfs/xfs_format.h

+0 −1
Original line number Diff line number Diff line
@@ -707,7 +707,6 @@ typedef struct xfs_agf { 
/* disk block (xfs_daddr_t) in the AG */

#define XFS_AGF_DADDR(mp)	((xfs_daddr_t)(1 << (mp)->m_sectbb_log))

#define	XFS_AGF_BLOCK(mp)	XFS_HDR_BLOCK(mp, XFS_AGF_DADDR(mp))

#define	XFS_BUF_TO_AGF(bp)	((xfs_agf_t *)((bp)->b_addr))



/*

 * Size of the unlinked inode hash table in the agi.

fs/xfs/libxfs/xfs_refcount_btree.c

+6 −6
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ xfs_refcountbt_set_root( 
	int			inc)

{

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

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(agbp);

	struct xfs_agf		*agf = agbp->b_addr;

	xfs_agnumber_t		seqno = be32_to_cpu(agf->agf_seqno);

	struct xfs_perag	*pag = xfs_perag_get(cur->bc_mp, seqno);
@@ -58,7 +58,7 @@ xfs_refcountbt_alloc_block( 
	int			*stat)

{

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

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(agbp);

	struct xfs_agf		*agf = agbp->b_addr;

	struct xfs_alloc_arg	args;		/* block allocation args */

	int			error;		/* error return value */
@@ -102,7 +102,7 @@ xfs_refcountbt_free_block( 
{

	struct xfs_mount	*mp = cur->bc_mp;

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

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(agbp);

	struct xfs_agf		*agf = agbp->b_addr;

	xfs_fsblock_t		fsbno = XFS_DADDR_TO_FSB(mp, XFS_BUF_ADDR(bp));

	int			error;
@@ -169,7 +169,7 @@ xfs_refcountbt_init_ptr_from_cur( 
	struct xfs_btree_cur	*cur,

	union xfs_btree_ptr	*ptr)

{

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(cur->bc_private.a.agbp);

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



	ASSERT(cur->bc_private.a.agno == be32_to_cpu(agf->agf_seqno));
@@ -320,7 +320,7 @@ xfs_refcountbt_init_cursor( 
	struct xfs_buf		*agbp,

	xfs_agnumber_t		agno)

{

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(agbp);

	struct xfs_agf		*agf = agbp->b_addr;

	struct xfs_btree_cur	*cur;



	ASSERT(agno != NULLAGNUMBER);
@@ -420,7 +420,7 @@ xfs_refcountbt_calc_reserves( 
	if (error)

		return error;



	agf = XFS_BUF_TO_AGF(agbp);

	agf = agbp->b_addr;

	agblocks = be32_to_cpu(agf->agf_length);

	tree_len = be32_to_cpu(agf->agf_refcount_blocks);

	xfs_trans_brelse(tp, agbp);