xfs: pass a pag to xfs_extent_busy_{search,reuse}

Source kernel commit: b6dc8c6dd2d3f230e1a554f869d6df4568a2dfbb

Replace the [mp,agno] tuple with the perag structure, which will become
more useful later.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 97f5003ea5386272bad8e888919b83fad2a0d144..9505806131bc42ccd0df4da05fd6950ee521732f 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -465,7 +465,7 @@ xfs_buf_readahead(
 #define XFS_EXTENT_BUSY_DISCARDED      0x01    /* undergoing a discard op. */
 #define XFS_EXTENT_BUSY_SKIP_DISCARD   0x02    /* do not discard */
 
-#define xfs_extent_busy_reuse(mp,ag,bno,len,user)      ((void) 0)
+#define xfs_extent_busy_reuse(...)                     ((void) 0)
 /* avoid unused variable warning */
 #define xfs_extent_busy_insert(tp,pag,bno,len,flags)({         \
        struct xfs_perag *__foo = pag;                  \

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index 19b38eaf45dd071857b1182c48b08f0eb85d8241..ed04e40856740bfd8ec733009f97cd01613b7604 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -1248,7 +1248,7 @@ xfs_alloc_ag_vextent_small(
        if (fbno == NULLAGBLOCK)
                goto out;
 
-       xfs_extent_busy_reuse(args->mp, args->pag, fbno, 1,
+       xfs_extent_busy_reuse(args->pag, fbno, 1,
                              (args->datatype & XFS_ALLOC_NOBUSY));
 
        if (args->datatype & XFS_ALLOC_USERDATA) {
@@ -3610,7 +3610,7 @@ xfs_alloc_vextent_finish(
                if (error)
                        goto out_drop_perag;
 
-               ASSERT(!xfs_extent_busy_search(mp, args->pag, args->agbno,
+               ASSERT(!xfs_extent_busy_search(args->pag, args->agbno,
                                args->len));
        }
 

diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c
index 4a711f2463cd30a1c70029661dd7f0adb657bfff..949cd18ab16a99f2768cd5c9964d52853e6b790d 100644 (file)
--- a/libxfs/xfs_alloc_btree.c
+++ b/libxfs/xfs_alloc_btree.c
@@ -84,7 +84,7 @@ xfs_allocbt_alloc_block(
        }
 
        atomic64_inc(&cur->bc_mp->m_allocbt_blks);
-       xfs_extent_busy_reuse(cur->bc_mp, cur->bc_ag.pag, bno, 1, false);
+       xfs_extent_busy_reuse(cur->bc_ag.pag, bno, 1, false);
 
        new->s = cpu_to_be32(bno);
 

diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c
index ada58e92645020c1e11a9f6429214ce85f816772..c261d6eae3bc3bc79976d23999fac48b9bf0e3de 100644 (file)
--- a/libxfs/xfs_rmap_btree.c
+++ b/libxfs/xfs_rmap_btree.c
@@ -101,7 +101,7 @@ xfs_rmapbt_alloc_block(
                return 0;
        }
 
-       xfs_extent_busy_reuse(cur->bc_mp, pag, bno, 1, false);
+       xfs_extent_busy_reuse(pag, bno, 1, false);
 
        new->s = cpu_to_be32(bno);
        be32_add_cpu(&agf->agf_rmap_blocks, 1);