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

xfs: pass perag to xfs_alloc_put_freelist

Browse Source 
It's available in all callers, so pass it in so that the perag can
be passed further down the stack.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Dave Chinner 2022-07-07 19:08:08 +10:00 committed by Dave Chinner
parent 49f0d84ec1
commit 8c392eb27f
5 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/xfs/libxfs/xfs_alloc.c
View File

@ -2742,7 +2742,7 @@ xfs_alloc_fix_freelist(
* Put each allocated block on the list. * Put each allocated block on the list.
*/ */
for (bno = targs.agbno; bno < targs.agbno + targs.len; bno++) { for (bno = targs.agbno; bno < targs.agbno + targs.len; bno++) {
error = xfs_alloc_put_freelist(tp, agbp, error = xfs_alloc_put_freelist(pag, tp, agbp,
agflbp, bno, 0); agflbp, bno, 0);
if (error) if (error)
goto out_agflbp_relse; goto out_agflbp_relse;
@ -2872,6 +2872,7 @@ xfs_alloc_log_agf(
*/ */
int int
xfs_alloc_put_freelist( xfs_alloc_put_freelist(
struct xfs_perag *pag,
struct xfs_trans *tp, struct xfs_trans *tp,
struct xfs_buf *agbp, struct xfs_buf *agbp,
struct xfs_buf *agflbp, struct xfs_buf *agflbp,
@ -2880,7 +2881,6 @@ xfs_alloc_put_freelist(
{ {
struct xfs_mount *mp = tp->t_mountp; struct xfs_mount *mp = tp->t_mountp;
struct xfs_agf *agf = agbp->b_addr; struct xfs_agf *agf = agbp->b_addr;
struct xfs_perag *pag;
__be32 *blockp; __be32 *blockp;
int error; int error;
uint32_t logflags; uint32_t logflags;
@ -2894,7 +2894,6 @@ xfs_alloc_put_freelist(
if (be32_to_cpu(agf->agf_fllast) == xfs_agfl_size(mp)) if (be32_to_cpu(agf->agf_fllast) == xfs_agfl_size(mp))
agf->agf_fllast = 0; agf->agf_fllast = 0;
pag = agbp->b_pag;
ASSERT(!pag->pagf_agflreset); ASSERT(!pag->pagf_agflreset);
be32_add_cpu(&agf->agf_flcount, 1); be32_add_cpu(&agf->agf_flcount, 1);
pag->pagf_flcount++; pag->pagf_flcount++;

14
fs/xfs/libxfs/xfs_alloc.h
View File

@ -97,6 +97,9 @@ unsigned int xfs_alloc_min_freelist(struct xfs_mount *mp,
struct xfs_perag *pag); struct xfs_perag *pag);
int xfs_alloc_get_freelist(struct xfs_perag *pag, struct xfs_trans *tp, int xfs_alloc_get_freelist(struct xfs_perag *pag, struct xfs_trans *tp,
struct xfs_buf *agfbp, xfs_agblock_t *bnop, int btreeblk); struct xfs_buf *agfbp, xfs_agblock_t *bnop, int btreeblk);
int xfs_alloc_put_freelist(struct xfs_perag *pag, struct xfs_trans *tp,
struct xfs_buf *agfbp, struct xfs_buf *agflbp,
xfs_agblock_t bno, int btreeblk);
/* /*
* Compute and fill in value of m_alloc_maxlevels. * Compute and fill in value of m_alloc_maxlevels.
@ -114,17 +117,6 @@ xfs_alloc_log_agf(
struct xfs_buf *bp, /* buffer for a.g. freelist header */ struct xfs_buf *bp, /* buffer for a.g. freelist header */
uint32_t fields);/* mask of fields to be logged (XFS_AGF_...) */ uint32_t fields);/* mask of fields to be logged (XFS_AGF_...) */
/*
* Put the block on the freelist for the allocation group.
*/
int /* error */
xfs_alloc_put_freelist(
struct xfs_trans *tp, /* transaction pointer */
struct xfs_buf *agbp, /* buffer for a.g. freelist header */
struct xfs_buf *agflbp,/* buffer for a.g. free block array */
xfs_agblock_t bno, /* block being freed */
int btreeblk); /* owner was a AGF btree */
/* /*
* Allocate an extent (variable-size). * Allocate an extent (variable-size).
*/ */

3
fs/xfs/libxfs/xfs_alloc_btree.c
View File

@ -89,7 +89,8 @@ xfs_allocbt_free_block(
int error; int error;
bno = xfs_daddr_to_agbno(cur->bc_mp, xfs_buf_daddr(bp)); bno = xfs_daddr_to_agbno(cur->bc_mp, xfs_buf_daddr(bp));
error = xfs_alloc_put_freelist(cur->bc_tp, agbp, NULL, bno, 1); error = xfs_alloc_put_freelist(cur->bc_ag.pag, cur->bc_tp, agbp, NULL,
bno, 1);
if (error) if (error)
return error; return error;

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

@ -129,7 +129,7 @@ xfs_rmapbt_free_block(
bno, 1); bno, 1);
be32_add_cpu(&agf->agf_rmap_blocks, -1); be32_add_cpu(&agf->agf_rmap_blocks, -1);
xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS); xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS);
error = xfs_alloc_put_freelist(cur->bc_tp, agbp, NULL, bno, 1); error = xfs_alloc_put_freelist(pag, cur->bc_tp, agbp, NULL, bno, 1);
if (error) if (error)
return error; return error;

4
fs/xfs/scrub/repair.c
View File

@ -516,8 +516,8 @@ xrep_put_freelist(
return error; return error;
/* Put the block on the AGFL. */ /* Put the block on the AGFL. */
error = xfs_alloc_put_freelist(sc->tp, sc->sa.agf_bp, sc->sa.agfl_bp, error = xfs_alloc_put_freelist(sc->sa.pag, sc->tp, sc->sa.agf_bp,
agbno, 0); sc->sa.agfl_bp, agbno, 0);
if (error) if (error)
return error; return error;
xfs_extent_busy_insert(sc->tp, sc->sa.pag, agbno, 1, xfs_extent_busy_insert(sc->tp, sc->sa.pag, agbno, 1,