Commit cd32a0c0 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

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: 1c7ce115 ("xfs: reap large AG metadata extents when possible")
Signed-off-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent b320789d

fs/xfs/scrub/reap.c

+5 −4
Original line number Diff line number Diff line
@@ -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);