Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

xfs: Remove macro XFS_BUF_HOLD 



Remove the definition and usage of the macro XFS_BUF_HOLD

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 b75e40a4

fs/xfs/linux-2.6/xfs_buf.h

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

#define XFS_BUF_ISASYNC(bp)	((bp)->b_flags & XBF_ASYNC)



#define XFS_BUF_HOLD(bp)	xfs_buf_hold(bp)

#define XFS_BUF_READ(bp)	((bp)->b_flags |= XBF_READ)

#define XFS_BUF_UNREAD(bp)	((bp)->b_flags &= ~XBF_READ)

#define XFS_BUF_ISREAD(bp)	((bp)->b_flags & XBF_READ)

fs/xfs/xfs_buf_item.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ xfs_buf_item_trylock( 
		return XFS_ITEM_LOCKED;



	/* take a reference to the buffer.  */

	XFS_BUF_HOLD(bp);

	xfs_buf_hold(bp);



	ASSERT(!(bip->bli_flags & XFS_BLI_STALE));

	trace_xfs_buf_item_trylock(bip);

fs/xfs/xfs_log_recover.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ xlog_bwrite( 


	XFS_BUF_SET_ADDR(bp, log->l_logBBstart + blk_no);

	XFS_BUF_ZEROFLAGS(bp);

	XFS_BUF_HOLD(bp);

	xfs_buf_hold(bp);

	xfs_buf_lock(bp);

	XFS_BUF_SET_COUNT(bp, BBTOB(nbblks));

	XFS_BUF_SET_TARGET(bp, log->l_mp->m_logdev_targp);

fs/xfs/xfs_mount.c

+1 −1
Original line number Diff line number Diff line
@@ -1938,7 +1938,7 @@ xfs_getsb( 
		xfs_buf_lock(bp);

	}



	XFS_BUF_HOLD(bp);

	xfs_buf_hold(bp);

	ASSERT(XFS_BUF_ISDONE(bp));

	return bp;

}