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

Commit 38f23232 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: remove XFS_BUF_SET_VTYPE and XFS_BUF_SET_VTYPE_REF 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 5fde0326

fs/xfs/xfs_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ xfs_alloc_read_agfl( 
	if (error)

		return error;

	ASSERT(!xfs_buf_geterror(bp));

	XFS_BUF_SET_VTYPE_REF(bp, B_FS_AGFL, XFS_AGFL_REF);

	xfs_buf_set_ref(bp, XFS_AGFL_REF);

	*bpp = bp;

	return 0;

}
@@ -2139,7 +2139,7 @@ xfs_read_agf( 
		xfs_trans_brelse(tp, *bpp);

		return XFS_ERROR(EFSCORRUPTED);

	}

	XFS_BUF_SET_VTYPE_REF(*bpp, B_FS_AGF, XFS_AGF_REF);

	xfs_buf_set_ref(*bpp, XFS_AGF_REF);

	return 0;

}

fs/xfs/xfs_btree.c

+4 −4
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ xfs_btree_read_bufl( 
	}

	ASSERT(!xfs_buf_geterror(bp));

	if (bp)

		XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, refval);

		xfs_buf_set_ref(bp, refval);

	*bpp = bp;

	return 0;

}
@@ -939,13 +939,13 @@ xfs_btree_set_refs( 
	switch (cur->bc_btnum) {

	case XFS_BTNUM_BNO:

	case XFS_BTNUM_CNT:

		XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, XFS_ALLOC_BTREE_REF);

		xfs_buf_set_ref(bp, XFS_ALLOC_BTREE_REF);

		break;

	case XFS_BTNUM_INO:

		XFS_BUF_SET_VTYPE_REF(bp, B_FS_INOMAP, XFS_INO_BTREE_REF);

		xfs_buf_set_ref(bp, XFS_INO_BTREE_REF);

		break;

	case XFS_BTNUM_BMAP:

		XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, XFS_BMAP_BTREE_REF);

		xfs_buf_set_ref(bp, XFS_BMAP_BTREE_REF);

		break;

	default:

		ASSERT(0);

fs/xfs/xfs_buf.h

+1 −6
Original line number Diff line number Diff line
@@ -278,15 +278,10 @@ void xfs_buf_stale(struct xfs_buf *bp); 
#define XFS_BUF_SIZE(bp)		((bp)->b_buffer_length)

#define XFS_BUF_SET_SIZE(bp, cnt)	((bp)->b_buffer_length = (cnt))



static inline void

xfs_buf_set_ref(

	struct xfs_buf	*bp,

	int		lru_ref)

static inline void xfs_buf_set_ref(struct xfs_buf *bp, int lru_ref)

{

	atomic_set(&bp->b_lru_ref, lru_ref);

}

#define XFS_BUF_SET_VTYPE_REF(bp, type, ref)	xfs_buf_set_ref(bp, ref)

#define XFS_BUF_SET_VTYPE(bp, type)		do { } while (0)



static inline int xfs_buf_ispinned(struct xfs_buf *bp)

{

fs/xfs/xfs_da_btree.c

+4 −7
Original line number Diff line number Diff line
@@ -2053,13 +2053,10 @@ xfs_da_do_buf( 
		if (!bp)

			continue;

		if (caller == 1) {

			if (whichfork == XFS_ATTR_FORK) {

				XFS_BUF_SET_VTYPE_REF(bp, B_FS_ATTR_BTREE,

						XFS_ATTR_BTREE_REF);

			} else {

				XFS_BUF_SET_VTYPE_REF(bp, B_FS_DIR_BTREE,

						XFS_DIR_BTREE_REF);

			}

			if (whichfork == XFS_ATTR_FORK)

				xfs_buf_set_ref(bp, XFS_ATTR_BTREE_REF);

			else

				xfs_buf_set_ref(bp, XFS_DIR_BTREE_REF);

		}

		if (bplist) {

			bplist[nbplist++] = bp;

fs/xfs/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ xfs_qm_dqread( 
	dqp->q_res_rtbcount = be64_to_cpu(ddqp->d_rtbcount);



	/* Mark the buf so that this will stay incore a little longer */

	XFS_BUF_SET_VTYPE_REF(bp, B_FS_DQUOT, XFS_DQUOT_REF);

	xfs_buf_set_ref(bp, XFS_DQUOT_REF);



	/*

	 * We got the buffer with a xfs_trans_read_buf() (in dqtobp())