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

Commit 0cadda1c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: remove duplicate buffer flags 



Currently we define aliases for the buffer flags in various
namespaces, which only adds confusion.  Remove all but the XBF_
flags to clean this up a bit.

Note that we still abuse XFS_B_ASYNC/XBF_ASYNC for some non-buffer
uses, but I'll clean that up later.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent a210c1aa

fs/xfs/linux-2.6/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -1169,7 +1169,7 @@ xfs_bioerror_relse( 
	XFS_BUF_STALE(bp);

	XFS_BUF_CLR_IODONE_FUNC(bp);

	XFS_BUF_CLR_BDSTRAT_FUNC(bp);

	if (!(fl & XFS_B_ASYNC)) {

	if (!(fl & XBF_ASYNC)) {

		/*

		 * Mark b_error and B_ERROR _both_.

		 * Lot's of chunkcache code assumes that.

fs/xfs/linux-2.6/xfs_buf.h

+4 −18
Original line number Diff line number Diff line
@@ -275,33 +275,19 @@ extern void xfs_buf_terminate(void); 
	({ char __b[BDEVNAME_SIZE]; bdevname((target)->bt_bdev, __b); __b; })





#define XFS_B_ASYNC		XBF_ASYNC

#define XFS_B_DELWRI		XBF_DELWRI

#define XFS_B_READ		XBF_READ

#define XFS_B_WRITE		XBF_WRITE

#define XFS_B_STALE		XBF_STALE



#define XFS_BUF_TRYLOCK		XBF_TRYLOCK

#define XFS_INCORE_TRYLOCK	XBF_TRYLOCK

#define XFS_BUF_LOCK		XBF_LOCK

#define XFS_BUF_MAPPED		XBF_MAPPED



#define BUF_BUSY		XBF_DONT_BLOCK



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



#define XFS_BUF_STALE(bp)	((bp)->b_flags |= XFS_B_STALE)

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

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

#define XFS_BUF_STALE(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_SUPER_STALE(bp)	do {				\

					XFS_BUF_STALE(bp);	\

					xfs_buf_delwri_dequeue(bp);	\

					XFS_BUF_DONE(bp);	\

				} while (0)



#define XFS_BUF_MANAGE		XBF_FS_MANAGED

#define XFS_BUF_UNMANAGE(bp)	((bp)->b_flags &= ~XBF_FS_MANAGED)



#define XFS_BUF_DELAYWRITE(bp)		((bp)->b_flags |= XBF_DELWRI)
@@ -390,7 +376,7 @@ static inline void xfs_buf_relse(xfs_buf_t *bp) 


#define xfs_biomove(bp, off, len, data, rw) \

	    xfs_buf_iomove((bp), (off), (len), (data), \

		((rw) == XFS_B_WRITE) ? XBRW_WRITE : XBRW_READ)

		((rw) == XBF_WRITE) ? XBRW_WRITE : XBRW_READ)



#define xfs_biozero(bp, off, len) \

	    xfs_buf_iomove((bp), (off), (len), NULL, XBRW_ZERO)

fs/xfs/linux-2.6/xfs_fs_subr.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ xfs_flush_pages( 
		xfs_iflags_clear(ip, XFS_ITRUNCATED);

		ret = -filemap_fdatawrite(mapping);

	}

	if (flags & XFS_B_ASYNC)

	if (flags & XBF_ASYNC)

		return ret;

	ret2 = xfs_wait_on_pages(ip, first, last);

	if (!ret)

fs/xfs/linux-2.6/xfs_sync.c

+2 −2
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ xfs_sync_inode_data( 
	}



	error = xfs_flush_pages(ip, 0, -1, (flags & SYNC_WAIT) ?

				0 : XFS_B_ASYNC, FI_NONE);

				0 : XBF_ASYNC, FI_NONE);

	xfs_iunlock(ip, XFS_IOLOCK_SHARED);



 out_wait:
@@ -370,7 +370,7 @@ xfs_sync_fsdata( 
	if (flags & SYNC_TRYLOCK) {

		ASSERT(!(flags & SYNC_WAIT));



		bp = xfs_getsb(mp, XFS_BUF_TRYLOCK);

		bp = xfs_getsb(mp, XBF_TRYLOCK);

		if (!bp)

			goto out;

fs/xfs/quota/xfs_dquot.c

+1 −2
Original line number Diff line number Diff line
@@ -1527,8 +1527,7 @@ xfs_qm_dqflock_pushbuf_wait( 
	 * the flush lock when the I/O completes.

	 */

	bp = xfs_incore(dqp->q_mount->m_ddev_targp, dqp->q_blkno,

		    XFS_QI_DQCHUNKLEN(dqp->q_mount),

		    XFS_INCORE_TRYLOCK);

		    XFS_QI_DQCHUNKLEN(dqp->q_mount), XBF_TRYLOCK);

	if (bp != NULL) {

		if (XFS_BUF_ISDELAYWRITE(bp)) {

			int	error;