Commit 1157b32c authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: remove XBF_ASYNC flag wrapper macros 



They only set/clear/check a flag, no need for obfuscating this
with a macro.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent b0388bf1

fs/xfs/xfs_buf.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -321,10 +321,6 @@ void xfs_buf_stale(struct xfs_buf *bp); 
#define XFS_BUF_UNSTALE(bp)	((bp)->b_flags &= ~XBF_STALE)

#define XFS_BUF_UNSTALE(bp)	((bp)->b_flags &= ~XBF_STALE)

#define XFS_BUF_ISSTALE(bp)	((bp)->b_flags & XBF_STALE)

#define XFS_BUF_ISSTALE(bp)	((bp)->b_flags & XBF_STALE)





#define XFS_BUF_ASYNC(bp)	((bp)->b_flags |= XBF_ASYNC)

#define XFS_BUF_UNASYNC(bp)	((bp)->b_flags &= ~XBF_ASYNC)

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



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

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

#define XFS_BUF_UNREAD(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)

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

fs/xfs/xfs_buf_item.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1090,7 +1090,7 @@ xfs_buf_iodone_callbacks( 
	 * errors tend to affect the whole device and a failing log write

	 * errors tend to affect the whole device and a failing log write

	 * will make us give up.  But we really ought to do better here.

	 * will make us give up.  But we really ought to do better here.

	 */

	 */

	if (XFS_BUF_ISASYNC(bp)) {

	if (bp->b_flags & XBF_ASYNC) {

		ASSERT(bp->b_iodone != NULL);

		ASSERT(bp->b_iodone != NULL);





		trace_xfs_buf_item_iodone_async(bp, _RET_IP_);

		trace_xfs_buf_item_iodone_async(bp, _RET_IP_);

fs/xfs/xfs_log.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -1212,7 +1212,7 @@ xlog_iodone(xfs_buf_t *bp) 
	}

	}





	/* log I/O is always issued ASYNC */

	/* log I/O is always issued ASYNC */

	ASSERT(XFS_BUF_ISASYNC(bp));

	ASSERT(bp->b_flags & XBF_ASYNC);

	xlog_state_done_syncing(iclog, aborted);

	xlog_state_done_syncing(iclog, aborted);





	/*

	/*
@@ -1865,8 +1865,7 @@ xlog_sync( 
	bp->b_io_length = BTOBB(count);

	bp->b_io_length = BTOBB(count);

	bp->b_fspriv = iclog;

	bp->b_fspriv = iclog;

	XFS_BUF_ZEROFLAGS(bp);

	XFS_BUF_ZEROFLAGS(bp);

	XFS_BUF_ASYNC(bp);

	bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO);

	bp->b_flags |= XBF_SYNCIO;





	if (log->l_mp->m_flags & XFS_MOUNT_BARRIER) {

	if (log->l_mp->m_flags & XFS_MOUNT_BARRIER) {

		bp->b_flags |= XBF_FUA;

		bp->b_flags |= XBF_FUA;
@@ -1911,8 +1910,7 @@ xlog_sync( 
				(char *)&iclog->ic_header + count, split);

				(char *)&iclog->ic_header + count, split);

		bp->b_fspriv = iclog;

		bp->b_fspriv = iclog;

		XFS_BUF_ZEROFLAGS(bp);

		XFS_BUF_ZEROFLAGS(bp);

		XFS_BUF_ASYNC(bp);

		bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO);

		bp->b_flags |= XBF_SYNCIO;

		if (log->l_mp->m_flags & XFS_MOUNT_BARRIER)

		if (log->l_mp->m_flags & XFS_MOUNT_BARRIER)

			bp->b_flags |= XBF_FUA;

			bp->b_flags |= XBF_FUA;

fs/xfs/xfs_log_recover.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -4926,10 +4926,9 @@ xlog_do_recover( 
	 * updates, re-read in the superblock and reverify it.

	 * updates, re-read in the superblock and reverify it.

	 */

	 */

	bp = xfs_getsb(log->l_mp, 0);

	bp = xfs_getsb(log->l_mp, 0);

	bp->b_flags &= ~XBF_DONE;

	bp->b_flags &= ~(XBF_DONE | XBF_ASYNC);

	ASSERT(!(XFS_BUF_ISWRITE(bp)));

	ASSERT(!(XFS_BUF_ISWRITE(bp)));

	XFS_BUF_READ(bp);

	XFS_BUF_READ(bp);

	XFS_BUF_UNASYNC(bp);

	bp->b_ops = &xfs_sb_buf_ops;

	bp->b_ops = &xfs_sb_buf_ops;





	error = xfs_buf_submit_wait(bp);

	error = xfs_buf_submit_wait(bp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE