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

Commit 8925a3dc authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: make xfs_buf_incore out of line 



Move xfs_buf_incore out of line and make it the only way to look up
a buffer in the buffer cache from outside the buffer cache. Convert
the external users of _xfs_buf_find() to xfs_buf_incore() and make
_xfs_buf_find() static.

Signed-Off-By: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
[darrick: actually rename xfs_incore -> xfs_buf_incore]
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent e443523d

fs/xfs/libxfs/xfs_attr_remote.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ xfs_attr_rmtval_remove( 
		/*

		 * If the "remote" value is in the cache, remove it.

		 */

		bp = xfs_incore(mp->m_ddev_targp, dblkno, dblkcnt, XBF_TRYLOCK);

		bp = xfs_buf_incore(mp->m_ddev_targp, dblkno, dblkcnt, XBF_TRYLOCK);

		if (bp) {

			xfs_buf_stale(bp);

			xfs_buf_relse(bp);

fs/xfs/xfs_buf.c

+16 −5
Original line number Diff line number Diff line
@@ -549,17 +549,17 @@ xfs_buf_hash_destroy( 
}



/*

 *	Look up, and creates if absent, a lockable buffer for

 *	a given range of an inode.  The buffer is returned

 *	locked.	No I/O is implied by this call.

 * Look up (and insert if absent), a lockable buffer for a given

 * range of an inode.  The buffer is returned locked. No I/O is

 * implied by this call.

 */

xfs_buf_t *

static struct xfs_buf *

_xfs_buf_find(

	struct xfs_buftarg	*btp,

	struct xfs_buf_map	*map,

	int			nmaps,

	xfs_buf_flags_t		flags,

	xfs_buf_t		*new_bp)

	struct xfs_buf		*new_bp)

{

	struct xfs_perag	*pag;

	xfs_buf_t		*bp;
@@ -649,6 +649,17 @@ _xfs_buf_find( 
	return bp;

}



struct xfs_buf *

xfs_buf_incore(

	struct xfs_buftarg	*target,

	xfs_daddr_t		blkno,

	size_t			numblks,

	xfs_buf_flags_t		flags)

{

	DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);

	return _xfs_buf_find(target, &map, 1, flags, NULL);

}



/*

 * Assembles a buffer covering the specified range. The code is optimised for

 * cache hits, as metadata intensive workloads will see 3 orders of magnitude

fs/xfs/xfs_buf.h

+3 −14
Original line number Diff line number Diff line
@@ -218,20 +218,9 @@ typedef struct xfs_buf { 
} xfs_buf_t;



/* Finding and Reading Buffers */

struct xfs_buf *_xfs_buf_find(struct xfs_buftarg *target,

			      struct xfs_buf_map *map, int nmaps,

			      xfs_buf_flags_t flags, struct xfs_buf *new_bp);



static inline struct xfs_buf *

xfs_incore(

	struct xfs_buftarg	*target,

	xfs_daddr_t		blkno,

	size_t			numblks,

	xfs_buf_flags_t		flags)

{

	DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);

	return _xfs_buf_find(target, &map, 1, flags, NULL);

}

struct xfs_buf *xfs_buf_incore(struct xfs_buftarg *target,

			   xfs_daddr_t blkno, size_t numblks,

			   xfs_buf_flags_t flags);



struct xfs_buf *_xfs_buf_alloc(struct xfs_buftarg *target,

			       struct xfs_buf_map *map, int nmaps,

fs/xfs/xfs_qm.c

+2 −3
Original line number Diff line number Diff line
@@ -1247,9 +1247,8 @@ xfs_qm_flush_one( 
	 */

	if (!xfs_dqflock_nowait(dqp)) {

		/* buf is pinned in-core by delwri list */

		DEFINE_SINGLE_BUF_MAP(map, dqp->q_blkno,

				      mp->m_quotainfo->qi_dqchunklen);

		bp = _xfs_buf_find(mp->m_ddev_targp, &map, 1, 0, NULL);

		bp = xfs_buf_incore(mp->m_ddev_targp, dqp->q_blkno,

				mp->m_quotainfo->qi_dqchunklen, 0);

		if (!bp) {

			error = -EINVAL;

			goto out_unlock;