xfs: pass perag to xfs_alloc_put_freelist

Source kernel commit: 8c392eb27f7a98e403658d066e387c7b1c604f2b

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>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index e2251f258bcfcb1c65a682e3a0faafc95e2e8a5b..5bc485fd703d8f66704033a5f597f95b71196c90 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -2738,7 +2738,7 @@ xfs_alloc_fix_freelist(
                 * Put each allocated block on the list.
                 */
                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);
                        if (error)
                                goto out_agflbp_relse;
@@ -2868,6 +2868,7 @@ xfs_alloc_log_agf(
  */
 int
 xfs_alloc_put_freelist(
+       struct xfs_perag        *pag,
        struct xfs_trans        *tp,
        struct xfs_buf          *agbp,
        struct xfs_buf          *agflbp,
@@ -2876,7 +2877,6 @@ xfs_alloc_put_freelist(
 {
        struct xfs_mount        *mp = tp->t_mountp;
        struct xfs_agf          *agf = agbp->b_addr;
-       struct xfs_perag        *pag;
        __be32                  *blockp;
        int                     error;
        uint32_t                logflags;
@@ -2890,7 +2890,6 @@ xfs_alloc_put_freelist(
        if (be32_to_cpu(agf->agf_fllast) == xfs_agfl_size(mp))
                agf->agf_fllast = 0;
 
-       pag = agbp->b_pag;
        ASSERT(!pag->pagf_agflreset);
        be32_add_cpu(&agf->agf_flcount, 1);
        pag->pagf_flcount++;

diff --git a/libxfs/xfs_alloc.h b/libxfs/xfs_alloc.h
index 6349f0e5f93d48ddd1af7aa97b020c1964d0c547..d32a70a28c32ca220be6566a744e25ec4b65e2fc 100644 (file)
--- a/libxfs/xfs_alloc.h
+++ b/libxfs/xfs_alloc.h
@@ -97,6 +97,9 @@ unsigned int xfs_alloc_min_freelist(struct xfs_mount *mp,
                struct xfs_perag *pag);
 int xfs_alloc_get_freelist(struct xfs_perag *pag, struct xfs_trans *tp,
                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.
@@ -114,17 +117,6 @@ xfs_alloc_log_agf(
        struct xfs_buf  *bp,    /* buffer for a.g. freelist header */
        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).
  */

diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c
index 16be27927d1f15268b2142f748705b65bd87ae56..0d4a124943490dbb73dfedee916c319d4ae376aa 100644 (file)
--- a/libxfs/xfs_alloc_btree.c
+++ b/libxfs/xfs_alloc_btree.c
@@ -87,7 +87,8 @@ xfs_allocbt_free_block(
        int                     error;
 
        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)
                return error;
 

diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c
index 63a1a8f9b342bc18aa7a6fa3e663bcba4791a0d9..486a53969f3df83414fadc21294ed1c131682ef5 100644 (file)
--- a/libxfs/xfs_rmap_btree.c
+++ b/libxfs/xfs_rmap_btree.c
@@ -127,7 +127,7 @@ xfs_rmapbt_free_block(
                        bno, 1);
        be32_add_cpu(&agf->agf_rmap_blocks, -1);
        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)
                return error;