On Mon, Oct 20, 2025 at 11:49:51AM -0400, Sasha Levin wrote:
From: "Darrick J. Wong" djwong@kernel.org
[ Upstream commit cd32a0c0dcdf634f2e0e71f41c272e19dece6264 ]
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 [ adapted xfs_refcount_free_cow_extent() and xfs_rmap_free_extent() ] Signed-off-by: Sasha Levin sashal@kernel.org
Looks good to me, Acked-by: "Darrick J. Wong" djwong@kernel.org
--D
fs/xfs/scrub/reap.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/fs/xfs/scrub/reap.c b/fs/xfs/scrub/reap.c index 53697f3c5e1b0..8688edec58755 100644 --- a/fs/xfs/scrub/reap.c +++ b/fs/xfs/scrub/reap.c @@ -409,8 +409,6 @@ xreap_agextent_iter( if (crosslinked) { trace_xreap_dispose_unmap_extent(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
@@ -418,11 +416,14 @@ xreap_agextent_iter( * rmap record as well. */ xfs_refcount_free_cow_extent(sc->tp, 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, sc->sa.pag->pag_agno, agbno,*aglenp, rs->oinfo->oi_owner);rs->deferred++;return 0;trace_xreap_dispose_free_extent(sc->sa.pag, agbno, *aglenp); -- 2.51.0