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

Commit 821eb21d authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: connect up buffer reclaim priority hooks 



Now that the buffer reclaim infrastructure can handle different reclaim
priorities for different types of buffers, reconnect the hooks in the
XFS code that has been sitting dormant since it was ported to Linux. This
should finally give use reclaim prioritisation that is on a par with the
functionality that Irix provided XFS 15 years ago.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 430cbeb8

fs/xfs/linux-2.6/xfs_buf.h

+8 −2
Original line number Diff line number Diff line
@@ -336,9 +336,15 @@ 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))



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

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)

#define XFS_BUF_SET_REF(bp, ref)		do { } while (0)



#define XFS_BUF_ISPINNED(bp)	atomic_read(&((bp)->b_pin_count))

fs/xfs/xfs_btree.c

+4 −5
Original line number Diff line number Diff line
@@ -634,9 +634,8 @@ xfs_btree_read_bufl( 
		return error;

	}

	ASSERT(!bp || !XFS_BUF_GETERROR(bp));

	if (bp != NULL) {

	if (bp)

		XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, refval);

	}

	*bpp = bp;

	return 0;

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

	case XFS_BTNUM_BNO:

	case XFS_BTNUM_CNT:

		XFS_BUF_SET_VTYPE_REF(*bpp, B_FS_MAP, XFS_ALLOC_BTREE_REF);

		XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, XFS_ALLOC_BTREE_REF);

		break;

	case XFS_BTNUM_INO:

		XFS_BUF_SET_VTYPE_REF(*bpp, B_FS_INOMAP, XFS_INO_BTREE_REF);

		XFS_BUF_SET_VTYPE_REF(bp, B_FS_INOMAP, XFS_INO_BTREE_REF);

		break;

	case XFS_BTNUM_BMAP:

		XFS_BUF_SET_VTYPE_REF(*bpp, B_FS_MAP, XFS_BMAP_BTREE_REF);

		XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, XFS_BMAP_BTREE_REF);

		break;

	default:

		ASSERT(0);

fs/xfs/xfs_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ xfs_iread( 
	 * around for a while.  This helps to keep recently accessed

	 * meta-data in-core longer.

	 */

	XFS_BUF_SET_REF(bp, XFS_INO_REF);

	xfs_buf_set_ref(bp, XFS_INO_REF);



	/*

	 * Use xfs_trans_brelse() to release the buffer containing the

fs/xfs/xfs_trans.h

+1 −1
Original line number Diff line number Diff line
@@ -294,8 +294,8 @@ struct xfs_log_item_desc { 
#define	XFS_ALLOC_BTREE_REF	2

#define	XFS_BMAP_BTREE_REF	2

#define	XFS_DIR_BTREE_REF	2

#define	XFS_INO_REF		2

#define	XFS_ATTR_BTREE_REF	1

#define	XFS_INO_REF		1

#define	XFS_DQUOT_REF		1



#ifdef __KERNEL__