Commit b0388bf1 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: remove XBF_DONE 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 36f90b0a

fs/xfs/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ xfs_buf_read_map( 
	if (bp) {

		trace_xfs_buf_read(bp, flags, _RET_IP_);



		if (!XFS_BUF_ISDONE(bp)) {

		if (!(bp->b_flags & XBF_DONE)) {

			XFS_STATS_INC(target->bt_mount, xb_get_read);

			bp->b_ops = ops;

			_xfs_buf_read(bp, flags);

fs/xfs/xfs_buf.h

+0 −4
Original line number 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_ISSTALE(bp)	((bp)->b_flags & XBF_STALE)



#define XFS_BUF_DONE(bp)	((bp)->b_flags |= XBF_DONE)

#define XFS_BUF_UNDONE(bp)	((bp)->b_flags &= ~XBF_DONE)

#define XFS_BUF_ISDONE(bp)	((bp)->b_flags & XBF_DONE)



#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)

fs/xfs/xfs_buf_item.c

+3 −3
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ xfs_buf_item_unpin( 
		xfs_buf_hold(bp);

		bp->b_flags |= XBF_ASYNC;

		xfs_buf_ioerror(bp, -EIO);

		XFS_BUF_UNDONE(bp);

		bp->b_flags &= ~XBF_DONE;

		xfs_buf_stale(bp);

		xfs_buf_ioend(bp);

	}
@@ -1067,7 +1067,7 @@ xfs_buf_iodone_callbacks( 
	 */

	if (XFS_FORCED_SHUTDOWN(mp)) {

		xfs_buf_stale(bp);

		XFS_BUF_DONE(bp);

		bp->b_flags |= XBF_DONE;

		trace_xfs_buf_item_iodone(bp, _RET_IP_);

		goto do_callbacks;

	}
@@ -1113,7 +1113,7 @@ xfs_buf_iodone_callbacks( 
	 * sure to return the error to the caller of xfs_bwrite().

	 */

	xfs_buf_stale(bp);

	XFS_BUF_DONE(bp);

	bp->b_flags |= XBF_DONE;



	trace_xfs_buf_error_relse(bp, _RET_IP_);

fs/xfs/xfs_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3313,7 +3313,7 @@ cluster_corrupt_out: 
		 * mark it as stale and brelse.

		 */

		if (bp->b_iodone) {

			XFS_BUF_UNDONE(bp);

			bp->b_flags &= ~XBF_DONE;

			xfs_buf_stale(bp);

			xfs_buf_ioerror(bp, -EIO);

			xfs_buf_ioend(bp);

fs/xfs/xfs_log.c

+2 −2
Original line number Diff line number Diff line
@@ -3979,7 +3979,7 @@ xfs_log_force_umount( 
	    log->l_flags & XLOG_ACTIVE_RECOVERY) {

		mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN;

		if (mp->m_sb_bp)

			XFS_BUF_DONE(mp->m_sb_bp);

			mp->m_sb_bp->b_flags |= XBF_DONE;

		return 0;

	}
@@ -4009,7 +4009,7 @@ xfs_log_force_umount( 
	spin_lock(&log->l_icloglock);

	mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN;

	if (mp->m_sb_bp)

		XFS_BUF_DONE(mp->m_sb_bp);

		mp->m_sb_bp->b_flags |= XBF_DONE;



	/*

	 * Mark the log and the iclogs with IO error flags to prevent any

CRA Git | Maintained and supported by SUSTech CRA and CCSE