xfs: use deferred intent items for reaping crosslinked blocks

When we're removing rmap records for crosslinked blocks, use deferred
intent items so that we can try to free/unmap as many of the old data
structure's blocks as we can in the same transaction as the commit.

Cc: <stable@vger.kernel.org> # v6.6
Fixes: 1c7ce115e52106 ("xfs: reap large AG metadata extents when possible")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/scrub/reap.c b/fs/xfs/scrub/reap.c
index 8703897c0a9ccb958dd1dab9c76081c0ef908881..86d3d104b8d950b98f896bf7ef2f59e9243235ce 100644 (file)
--- a/fs/xfs/scrub/reap.c
+++ b/fs/xfs/scrub/reap.c
@@ -416,8 +416,6 @@ xreap_agextent_iter(
                trace_xreap_dispose_unmap_extent(pag_group(sc->sa.pag), agbno,
                                *aglenp);
 
-               rs->force_roll = true;
-
                if (rs->oinfo == &XFS_RMAP_OINFO_COW) {
                        /*
                         * If we're unmapping CoW staging extents, remove the
@@ -426,11 +424,14 @@ xreap_agextent_iter(
                         */
                        xfs_refcount_free_cow_extent(sc->tp, false, fsbno,
                                        *aglenp);
+                       rs->force_roll = true;
                        return 0;
                }
 
-               return xfs_rmap_free(sc->tp, sc->sa.agf_bp, sc->sa.pag, agbno,
-                               *aglenp, rs->oinfo);
+               xfs_rmap_free_extent(sc->tp, false, fsbno, *aglenp,
+                               rs->oinfo->oi_owner);
+               rs->deferred++;
+               return 0;
        }
 
        trace_xreap_dispose_free_extent(pag_group(sc->sa.pag), agbno, *aglenp);