Commit 370c782b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove XFS_BUF_TO_AGI 



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 4b975108

fs/xfs/libxfs/xfs_ag.c

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

	struct aghdr_init_data	*id)

{

	struct xfs_agi		*agi = XFS_BUF_TO_AGI(bp);

	struct xfs_agi		*agi = bp->b_addr;

	int			bucket;



	agi->agi_magicnum = cpu_to_be32(XFS_AGI_MAGIC);
@@ -502,7 +502,7 @@ xfs_ag_extend_space( 
	if (error)

		return error;



	agi = XFS_BUF_TO_AGI(bp);

	agi = bp->b_addr;

	be32_add_cpu(&agi->agi_length, len);

	ASSERT(id->agno == mp->m_sb.sb_agcount - 1 ||

	       be32_to_cpu(agi->agi_length) == mp->m_sb.sb_agblocks);
@@ -569,7 +569,7 @@ xfs_ag_get_geometry( 
	memset(ageo, 0, sizeof(*ageo));

	ageo->ag_number = agno;



	agi = XFS_BUF_TO_AGI(agi_bp);

	agi = agi_bp->b_addr;

	ageo->ag_icount = be32_to_cpu(agi->agi_count);

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

fs/xfs/libxfs/xfs_format.h

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

#define XFS_AGI_DADDR(mp)	((xfs_daddr_t)(2 << (mp)->m_sectbb_log))

#define	XFS_AGI_BLOCK(mp)	XFS_HDR_BLOCK(mp, XFS_AGI_DADDR(mp))

#define	XFS_BUF_TO_AGI(bp)	((xfs_agi_t *)((bp)->b_addr))



/*

 * The third a.g. block contains the a.g. freelist, an array

fs/xfs/libxfs/xfs_ialloc.c

+13 −14
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ xfs_inobt_insert( 
	xfs_btnum_t		btnum)

{

	struct xfs_btree_cur	*cur;

	struct xfs_agi		*agi = XFS_BUF_TO_AGI(agbp);

	struct xfs_agi		*agi = agbp->b_addr;

	xfs_agnumber_t		agno = be32_to_cpu(agi->agi_seqno);

	xfs_agino_t		thisino;

	int			i;
@@ -525,7 +525,7 @@ xfs_inobt_insert_sprec( 
	bool				merge)	/* merge or replace */

{

	struct xfs_btree_cur		*cur;

	struct xfs_agi			*agi = XFS_BUF_TO_AGI(agbp);

	struct xfs_agi			*agi = agbp->b_addr;

	xfs_agnumber_t			agno = be32_to_cpu(agi->agi_seqno);

	int				error;

	int				i;
@@ -658,7 +658,7 @@ xfs_ialloc_ag_alloc( 
	 * chunk of inodes.  If the filesystem is striped, this will fill

	 * an entire stripe unit with inodes.

	 */

	agi = XFS_BUF_TO_AGI(agbp);

	agi = agbp->b_addr;

	newino = be32_to_cpu(agi->agi_newino);

	agno = be32_to_cpu(agi->agi_seqno);

	args.agbno = XFS_AGINO_TO_AGBNO(args.mp, newino) +
@@ -1130,7 +1130,7 @@ xfs_dialloc_ag_inobt( 
	xfs_ino_t		*inop)

{

	struct xfs_mount	*mp = tp->t_mountp;

	struct xfs_agi		*agi = XFS_BUF_TO_AGI(agbp);

	struct xfs_agi		*agi = agbp->b_addr;

	xfs_agnumber_t		agno = be32_to_cpu(agi->agi_seqno);

	xfs_agnumber_t		pagno = XFS_INO_TO_AGNO(mp, parent);

	xfs_agino_t		pagino = XFS_INO_TO_AGINO(mp, parent);
@@ -1583,7 +1583,7 @@ xfs_dialloc_ag( 
	xfs_ino_t		*inop)

{

	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_agi			*agi = XFS_BUF_TO_AGI(agbp);

	struct xfs_agi			*agi = agbp->b_addr;

	xfs_agnumber_t			agno = be32_to_cpu(agi->agi_seqno);

	xfs_agnumber_t			pagno = XFS_INO_TO_AGNO(mp, parent);

	xfs_agino_t			pagino = XFS_INO_TO_AGINO(mp, parent);
@@ -1943,7 +1943,7 @@ xfs_difree_inobt( 
	struct xfs_icluster		*xic,

	struct xfs_inobt_rec_incore	*orec)

{

	struct xfs_agi			*agi = XFS_BUF_TO_AGI(agbp);

	struct xfs_agi			*agi = agbp->b_addr;

	xfs_agnumber_t			agno = be32_to_cpu(agi->agi_seqno);

	struct xfs_perag		*pag;

	struct xfs_btree_cur		*cur;
@@ -2079,7 +2079,7 @@ xfs_difree_finobt( 
	xfs_agino_t			agino,

	struct xfs_inobt_rec_incore	*ibtrec) /* inobt record */

{

	struct xfs_agi			*agi = XFS_BUF_TO_AGI(agbp);

	struct xfs_agi			*agi = agbp->b_addr;

	xfs_agnumber_t			agno = be32_to_cpu(agi->agi_seqno);

	struct xfs_btree_cur		*cur;

	struct xfs_inobt_rec_incore	rec;
@@ -2489,9 +2489,8 @@ xfs_ialloc_log_agi( 
		sizeof(xfs_agi_t)

	};

#ifdef DEBUG

	xfs_agi_t		*agi;	/* allocation group header */

	struct xfs_agi		*agi = bp->b_addr;



	agi = XFS_BUF_TO_AGI(bp);

	ASSERT(agi->agi_magicnum == cpu_to_be32(XFS_AGI_MAGIC));

#endif
@@ -2523,14 +2522,13 @@ xfs_agi_verify( 
	struct xfs_buf	*bp)

{

	struct xfs_mount *mp = bp->b_mount;

	struct xfs_agi	*agi = XFS_BUF_TO_AGI(bp);

	struct xfs_agi	*agi = bp->b_addr;

	int		i;



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

		if (!uuid_equal(&agi->agi_uuid, &mp->m_sb.sb_meta_uuid))

			return __this_address;

		if (!xfs_log_check_lsn(mp,

				be64_to_cpu(XFS_BUF_TO_AGI(bp)->agi_lsn)))

		if (!xfs_log_check_lsn(mp, be64_to_cpu(agi->agi_lsn)))

			return __this_address;

	}
@@ -2593,6 +2591,7 @@ xfs_agi_write_verify( 
{

	struct xfs_mount	*mp = bp->b_mount;

	struct xfs_buf_log_item	*bip = bp->b_log_item;

	struct xfs_agi		*agi = bp->b_addr;

	xfs_failaddr_t		fa;



	fa = xfs_agi_verify(bp);
@@ -2605,7 +2604,7 @@ xfs_agi_write_verify( 
		return;



	if (bip)

		XFS_BUF_TO_AGI(bp)->agi_lsn = cpu_to_be64(bip->bli_item.li_lsn);

		agi->agi_lsn = cpu_to_be64(bip->bli_item.li_lsn);

	xfs_buf_update_cksum(bp, XFS_AGI_CRC_OFF);

}
@@ -2661,7 +2660,7 @@ xfs_ialloc_read_agi( 
	if (error)

		return error;



	agi = XFS_BUF_TO_AGI(*bpp);

	agi = (*bpp)->b_addr;

	pag = xfs_perag_get(mp, agno);

	if (!pag->pagi_init) {

		pag->pagi_freecount = be32_to_cpu(agi->agi_freecount);

fs/xfs/libxfs/xfs_ialloc_btree.c

+5 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ xfs_inobt_set_root( 
	int			inc)	/* level change */

{

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

	struct xfs_agi		*agi = XFS_BUF_TO_AGI(agbp);

	struct xfs_agi		*agi = agbp->b_addr;



	agi->agi_root = nptr->s;

	be32_add_cpu(&agi->agi_level, inc);
@@ -59,7 +59,7 @@ xfs_finobt_set_root( 
	int			inc)	/* level change */

{

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

	struct xfs_agi		*agi = XFS_BUF_TO_AGI(agbp);

	struct xfs_agi		*agi = agbp->b_addr;



	agi->agi_free_root = nptr->s;

	be32_add_cpu(&agi->agi_free_level, inc);
@@ -212,7 +212,7 @@ xfs_inobt_init_ptr_from_cur( 
	struct xfs_btree_cur	*cur,

	union xfs_btree_ptr	*ptr)

{

	struct xfs_agi		*agi = XFS_BUF_TO_AGI(cur->bc_private.a.agbp);

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



	ASSERT(cur->bc_private.a.agno == be32_to_cpu(agi->agi_seqno));
@@ -224,7 +224,7 @@ xfs_finobt_init_ptr_from_cur( 
	struct xfs_btree_cur	*cur,

	union xfs_btree_ptr	*ptr)

{

	struct xfs_agi		*agi = XFS_BUF_TO_AGI(cur->bc_private.a.agbp);

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



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

	ptr->s = agi->agi_free_root;
@@ -410,7 +410,7 @@ xfs_inobt_init_cursor( 
	xfs_agnumber_t		agno,		/* allocation group number */

	xfs_btnum_t		btnum)		/* ialloc or free ino btree */

{

	struct xfs_agi		*agi = XFS_BUF_TO_AGI(agbp);

	struct xfs_agi		*agi = agbp->b_addr;

	struct xfs_btree_cur	*cur;



	cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);

fs/xfs/scrub/agheader.c

+2 −2
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static inline void 
xchk_agi_xref_icounts(

	struct xfs_scrub	*sc)

{

	struct xfs_agi		*agi = XFS_BUF_TO_AGI(sc->sa.agi_bp);

	struct xfs_agi		*agi = sc->sa.agi_bp->b_addr;

	xfs_agino_t		icount;

	xfs_agino_t		freecount;

	int			error;
@@ -834,7 +834,7 @@ xchk_agi( 
		goto out;

	xchk_buffer_recheck(sc, sc->sa.agi_bp);



	agi = XFS_BUF_TO_AGI(sc->sa.agi_bp);

	agi = sc->sa.agi_bp->b_addr;



	/* Check the AG length */

	eoag = be32_to_cpu(agi->agi_length);