Commit 62926044 authored by Chandra Seetharaman's avatar Chandra Seetharaman Committed by Alex Elder
Browse files

xfs: Remove the macro XFS_BUF_PTR 



Remove the definition and usages of the macro XFS_BUF_PTR.

Signed-off-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 0095a21e

fs/xfs/linux-2.6/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -1320,7 +1320,7 @@ xfs_buf_offset( 
	struct page		*page;



	if (bp->b_flags & XBF_MAPPED)

		return XFS_BUF_PTR(bp) + offset;

		return bp->b_addr + offset;



	offset += bp->b_offset;

	page = bp->b_pages[offset >> PAGE_SHIFT];

fs/xfs/linux-2.6/xfs_buf.h

+0 −1
Original line number Diff line number Diff line
@@ -266,7 +266,6 @@ void xfs_buf_stale(struct xfs_buf *bp); 
#define XFS_BUF_UNWRITE(bp)	((bp)->b_flags &= ~XBF_WRITE)

#define XFS_BUF_ISWRITE(bp)	((bp)->b_flags & XBF_WRITE)



#define XFS_BUF_PTR(bp)			(xfs_caddr_t)((bp)->b_addr)

#define XFS_BUF_SET_PTR(bp, val, cnt)	xfs_buf_associate_memory(bp, val, cnt)

#define XFS_BUF_ADDR(bp)		((bp)->b_bn)

#define XFS_BUF_SET_ADDR(bp, bno)	((bp)->b_bn = (xfs_daddr_t)(bno))

fs/xfs/quota/xfs_dquot.c

+3 −3
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ xfs_qm_init_dquot_blk( 
	ASSERT(tp);

	ASSERT(xfs_buf_islocked(bp));



	d = (xfs_dqblk_t *)XFS_BUF_PTR(bp);

	d = bp->b_addr;



	/*

	 * ID of the first dquot in the block - id's are zero based.
@@ -538,7 +538,7 @@ xfs_qm_dqtobp( 
	/*

	 * calculate the location of the dquot inside the buffer.

	 */

	ddq = (struct xfs_disk_dquot *)(XFS_BUF_PTR(bp) + dqp->q_bufoffset);

	ddq = bp->b_addr + dqp->q_bufoffset;



	/*

	 * A simple sanity check in case we got a corrupted dquot...
@@ -1200,7 +1200,7 @@ xfs_qm_dqflush( 
	/*

	 * Calculate the location of the dquot inside the buffer.

	 */

	ddqp = (struct xfs_disk_dquot *)(XFS_BUF_PTR(bp) + dqp->q_bufoffset);

	ddqp = bp->b_addr + dqp->q_bufoffset;



	/*

	 * A simple sanity check in case we got a corrupted dquot..

fs/xfs/quota/xfs_qm.c

+1 −1
Original line number Diff line number Diff line
@@ -1240,7 +1240,7 @@ xfs_qm_reset_dqcounts( 
	do_div(j, sizeof(xfs_dqblk_t));

	ASSERT(mp->m_quotainfo->qi_dqperchunk == j);

#endif

	ddq = (xfs_disk_dquot_t *)XFS_BUF_PTR(bp);

	ddq = bp->b_addr;

	for (j = 0; j < mp->m_quotainfo->qi_dqperchunk; j++) {

		/*

		 * Do a sanity check, and if needed, repair the dqblk. Don't

fs/xfs/xfs_ag.h

+3 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 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 *)XFS_BUF_PTR(bp))

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



extern int xfs_read_agf(struct xfs_mount *mp, struct xfs_trans *tp,

			xfs_agnumber_t agno, int flags, struct xfs_buf **bpp);
@@ -156,7 +156,7 @@ 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 *)XFS_BUF_PTR(bp))

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



extern int xfs_read_agi(struct xfs_mount *mp, struct xfs_trans *tp,

				xfs_agnumber_t agno, struct xfs_buf **bpp);
@@ -168,7 +168,7 @@ extern int xfs_read_agi(struct xfs_mount *mp, struct xfs_trans *tp, 
#define XFS_AGFL_DADDR(mp)	((xfs_daddr_t)(3 << (mp)->m_sectbb_log))

#define	XFS_AGFL_BLOCK(mp)	XFS_HDR_BLOCK(mp, XFS_AGFL_DADDR(mp))

#define XFS_AGFL_SIZE(mp)	((mp)->m_sb.sb_sectsize / sizeof(xfs_agblock_t))

#define	XFS_BUF_TO_AGFL(bp)	((xfs_agfl_t *)XFS_BUF_PTR(bp))

#define	XFS_BUF_TO_AGFL(bp)	((xfs_agfl_t *)((bp)->b_addr))



typedef struct xfs_agfl {

	__be32		agfl_bno[1];	/* actually XFS_AGFL_SIZE(mp) */