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

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

xfs: Remove the macro XFS_BUF_BFLAGS 



Remove the definition of the macro XFS_BUF_BFLAGS and its usage.

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 55fb25d5

fs/xfs/linux-2.6/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -1094,7 +1094,7 @@ STATIC int 
xfs_bioerror_relse(

	struct xfs_buf	*bp)

{

	int64_t		fl = XFS_BUF_BFLAGS(bp);

	int64_t		fl = bp->b_flags;

	/*

	 * No need to wait until the buffer is unpinned.

	 * We aren't flushing it.

fs/xfs/linux-2.6/xfs_buf.h

+0 −1
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ extern void xfs_buf_terminate(void); 
	({ char __b[BDEVNAME_SIZE]; bdevname((target)->bt_bdev, __b); __b; })





#define XFS_BUF_BFLAGS(bp)	((bp)->b_flags)

#define XFS_BUF_ZEROFLAGS(bp) \

	((bp)->b_flags &= ~(XBF_READ|XBF_WRITE|XBF_ASYNC|XBF_DELWRI| \

			    XBF_SYNCIO|XBF_FUA|XBF_FLUSH))

fs/xfs/xfs_trans_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ xfs_trans_read_buf( 
	if (XFS_BUF_ISSTALE(bp) && XFS_BUF_ISDELAYWRITE(bp))

		xfs_notice(mp, "about to pop assert, bp == 0x%p", bp);

#endif

	ASSERT((XFS_BUF_BFLAGS(bp) & (XBF_STALE|XBF_DELWRI)) !=

	ASSERT((bp->b_flags & (XBF_STALE|XBF_DELWRI)) !=

				     (XBF_STALE|XBF_DELWRI));



	trace_xfs_trans_read_buf_shut(bp, _RET_IP_);