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

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

xfs: remove XBF_WRITE 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 0cac682f

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_WRITE(bp)	((bp)->b_flags |= XBF_WRITE)

#define XFS_BUF_UNWRITE(bp)	((bp)->b_flags &= ~XBF_WRITE)

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



/*

 * These macros use the IO block map rather than b_bn. b_bn is now really

 * just for the buffer cache index for cached buffers. As IO does not use b_bn

fs/xfs/xfs_log.c

+3 −5
Original line number Diff line number Diff line
@@ -1865,7 +1865,7 @@ xlog_sync( 
	bp->b_io_length = BTOBB(count);

	bp->b_fspriv = iclog;

	XFS_BUF_ZEROFLAGS(bp);

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

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



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

		bp->b_flags |= XBF_FUA;
@@ -1892,12 +1892,11 @@ xlog_sync( 


	/* account for log which doesn't start at block #0 */

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



	/*

	 * Don't call xfs_bwrite here. We do log-syncs even when the filesystem

	 * is shutting down.

	 */

	XFS_BUF_WRITE(bp);



	error = xlog_bdstrat(bp);

	if (error) {

		xfs_buf_ioerror_alert(bp, "xlog_sync");
@@ -1910,7 +1909,7 @@ xlog_sync( 
				(char *)&iclog->ic_header + count, split);

		bp->b_fspriv = iclog;

		XFS_BUF_ZEROFLAGS(bp);

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

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

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

			bp->b_flags |= XBF_FUA;
@@ -1919,7 +1918,6 @@ xlog_sync( 


		/* account for internal log which doesn't start at block #0 */

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

		XFS_BUF_WRITE(bp);

		error = xlog_bdstrat(bp);

		if (error) {

			xfs_buf_ioerror_alert(bp, "xlog_sync (split)");

fs/xfs/xfs_log_recover.c

+1 −1
Original line number Diff line number Diff line
@@ -4927,7 +4927,7 @@ xlog_do_recover( 
	 */

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

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

	ASSERT(!(XFS_BUF_ISWRITE(bp)));

	ASSERT(!(bp->b_flags & XBF_WRITE));

	bp->b_flags |= XBF_READ;

	bp->b_ops = &xfs_sb_buf_ops;