diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2025-04-08 16:14:32 -0700 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2025-09-05 08:48:21 -0700 |
| commit | cd32a0c0dcdf634f2e0e71f41c272e19dece6264 (patch) | |
| tree | 33d36fad7f355d5c44ad39bc43052f6163d05468 | |
| parent | b320789d6883cc00ac78ce83bccbfe7ed58afcf0 (diff) | |
| download | linux-next-cd32a0c0dcdf634f2e0e71f41c272e19dece6264.tar.gz linux-next-cd32a0c0dcdf634f2e0e71f41c272e19dece6264.zip | |
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>
| -rw-r--r-- | fs/xfs/scrub/reap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/xfs/scrub/reap.c b/fs/xfs/scrub/reap.c index 8703897c0a9c..86d3d104b8d9 100644 --- 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); |