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

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

xfs: Remove macro XFS_BUF_BUSY and family 



Remove the definitions and uses of the macros XFS_BUF_BUSY,
XFS_BUF_UNBUSY, and XFS_BUF_ISBUSY.

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 5a52c2a5

fs/xfs/linux-2.6/xfs_buf.c

+0 −1
Original line number Diff line number Diff line
@@ -679,7 +679,6 @@ xfs_buf_read_uncached( 
	/* set up the buffer for a read IO */

	XFS_BUF_SET_ADDR(bp, daddr);

	XFS_BUF_READ(bp);

	XFS_BUF_BUSY(bp);



	xfsbdstrat(mp, bp);

	error = xfs_buf_iowait(bp);

fs/xfs/linux-2.6/xfs_buf.h

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

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



#define XFS_BUF_BUSY(bp)	do { } while (0)

#define XFS_BUF_UNBUSY(bp)	do { } while (0)

#define XFS_BUF_ISBUSY(bp)	(1)



#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/quota/xfs_dquot.c

+0 −4
Original line number Diff line number Diff line
@@ -318,7 +318,6 @@ xfs_qm_init_dquot_blk( 
	int		curid, i;



	ASSERT(tp);

	ASSERT(XFS_BUF_ISBUSY(bp));

	ASSERT(xfs_buf_islocked(bp));



	d = (xfs_dqblk_t *)XFS_BUF_PTR(bp);
@@ -534,7 +533,6 @@ xfs_qm_dqtobp( 
			return XFS_ERROR(error);

	}



	ASSERT(XFS_BUF_ISBUSY(bp));

	ASSERT(xfs_buf_islocked(bp));



	/*
@@ -553,7 +551,6 @@ xfs_qm_dqtobp( 
			xfs_trans_brelse(tp, bp);

			return XFS_ERROR(EIO);

		}

		XFS_BUF_BUSY(bp); /* We dirtied this */

	}



	*O_bpp = bp;
@@ -622,7 +619,6 @@ xfs_qm_dqread( 
	 * this particular dquot was repaired. We still aren't afraid to

	 * brelse it because we have the changes incore.

	 */

	ASSERT(XFS_BUF_ISBUSY(bp));

	ASSERT(xfs_buf_islocked(bp));

	xfs_trans_brelse(tp, bp);

fs/xfs/xfs_buf_item.c

+0 −2
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ xfs_buf_item_pin( 
{

	struct xfs_buf_log_item	*bip = BUF_ITEM(lip);



	ASSERT(XFS_BUF_ISBUSY(bip->bli_buf));

	ASSERT(atomic_read(&bip->bli_refcount) > 0);

	ASSERT((bip->bli_flags & XFS_BLI_LOGGED) ||

	       (bip->bli_flags & XFS_BLI_STALE));
@@ -895,7 +894,6 @@ xfs_buf_attach_iodone( 
{

	xfs_log_item_t	*head_lip;



	ASSERT(XFS_BUF_ISBUSY(bp));

	ASSERT(xfs_buf_islocked(bp));



	lip->li_cb = cb;

fs/xfs/xfs_log.c

+0 −4
Original line number Diff line number Diff line
@@ -1051,7 +1051,6 @@ xlog_alloc_log(xfs_mount_t *mp, 
	if (!bp)

		goto out_free_log;

	bp->b_iodone = xlog_iodone;

	ASSERT(XFS_BUF_ISBUSY(bp));

	ASSERT(xfs_buf_islocked(bp));

	log->l_xbuf = bp;
@@ -1108,7 +1107,6 @@ xlog_alloc_log(xfs_mount_t *mp, 
		iclog->ic_callback_tail = &(iclog->ic_callback);

		iclog->ic_datap = (char *)iclog->ic_data + log->l_iclog_hsize;



		ASSERT(XFS_BUF_ISBUSY(iclog->ic_bp));

		ASSERT(xfs_buf_islocked(iclog->ic_bp));

		init_waitqueue_head(&iclog->ic_force_wait);

		init_waitqueue_head(&iclog->ic_write_wait);
@@ -1355,7 +1353,6 @@ xlog_sync(xlog_t *log, 
	XFS_BUF_SET_COUNT(bp, count);

	bp->b_fspriv = iclog;

	XFS_BUF_ZEROFLAGS(bp);

	XFS_BUF_BUSY(bp);

	XFS_BUF_ASYNC(bp);

	bp->b_flags |= XBF_SYNCIO;
@@ -1402,7 +1399,6 @@ xlog_sync(xlog_t *log, 
					    (__psint_t)count), split);

		bp->b_fspriv = iclog;

		XFS_BUF_ZEROFLAGS(bp);

		XFS_BUF_BUSY(bp);

		XFS_BUF_ASYNC(bp);

		bp->b_flags |= XBF_SYNCIO;

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