leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: make xfs_buf_incore out of line

Browse Source 
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: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
[darrick: actually rename xfs_incore -> xfs_buf_incore]
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Dave Chinner 2018-04-18 08:25:20 -07:00 committed by Darrick J. Wong
parent e443523d19
commit 8925a3dc47
4 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/libxfs/xfs_attr_remote.c
View File

@ -620,7 +620,7 @@ xfs_attr_rmtval_remove(
/* /*
* If the "remote" value is in the cache, remove it. * 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) { if (bp) {
xfs_buf_stale(bp); xfs_buf_stale(bp);
xfs_buf_relse(bp); xfs_buf_relse(bp);

21
fs/xfs/xfs_buf.c
View File

@ -549,17 +549,17 @@ xfs_buf_hash_destroy(
} }
/* /*
* Look up, and creates if absent, a lockable buffer for * Look up (and insert if absent), a lockable buffer for a given
* a given range of an inode. The buffer is returned * range of an inode. The buffer is returned locked. No I/O is
* locked. No I/O is implied by this call. * implied by this call.
*/ */
xfs_buf_t * static struct xfs_buf *
_xfs_buf_find( _xfs_buf_find(
struct xfs_buftarg *btp, struct xfs_buftarg *btp,
struct xfs_buf_map *map, struct xfs_buf_map *map,
int nmaps, int nmaps,
xfs_buf_flags_t flags, xfs_buf_flags_t flags,
xfs_buf_t *new_bp) struct xfs_buf *new_bp)
{ {
struct xfs_perag *pag; struct xfs_perag *pag;
xfs_buf_t *bp; xfs_buf_t *bp;
@ -649,6 +649,17 @@ found:
return bp; 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 * Assembles a buffer covering the specified range. The code is optimised for
* cache hits, as metadata intensive workloads will see 3 orders of magnitude * cache hits, as metadata intensive workloads will see 3 orders of magnitude

17
fs/xfs/xfs_buf.h
View File

@ -218,20 +218,9 @@ typedef struct xfs_buf {
} xfs_buf_t; } xfs_buf_t;
/* Finding and Reading Buffers */ /* Finding and Reading Buffers */
struct xfs_buf *_xfs_buf_find(struct xfs_buftarg *target, struct xfs_buf *xfs_buf_incore(struct xfs_buftarg *target,
struct xfs_buf_map *map, int nmaps, xfs_daddr_t blkno, size_t numblks,
xfs_buf_flags_t flags, struct xfs_buf *new_bp); xfs_buf_flags_t flags);
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_alloc(struct xfs_buftarg *target, struct xfs_buf *_xfs_buf_alloc(struct xfs_buftarg *target,
struct xfs_buf_map *map, int nmaps, struct xfs_buf_map *map, int nmaps,

5
fs/xfs/xfs_qm.c
View File

@ -1247,9 +1247,8 @@ xfs_qm_flush_one(
*/ */
if (!xfs_dqflock_nowait(dqp)) { if (!xfs_dqflock_nowait(dqp)) {
/* buf is pinned in-core by delwri list */ /* buf is pinned in-core by delwri list */
DEFINE_SINGLE_BUF_MAP(map, dqp->q_blkno, bp = xfs_buf_incore(mp->m_ddev_targp, dqp->q_blkno,
mp->m_quotainfo->qi_dqchunklen); mp->m_quotainfo->qi_dqchunklen, 0);
bp = _xfs_buf_find(mp->m_ddev_targp, &map, 1, 0, NULL);
if (!bp) { if (!bp) {
error = -EINVAL; error = -EINVAL;
goto out_unlock; goto out_unlock;