[PATCH] xfs_scrub: fix spacemap scan for data volume

[PATCH] xfs_scrub: fix spacemap scan for data volume

[Darrick J. Wong]

From: Darrick J. Wong <djwong@kernel.org>

I don't know why this hunk got copied into scan_ag_rmaps on merge.  The
original patch only touched scan_rtg_rmaps.  Get rid of this new
inclusion because now it's broken for the data device.

Cc: <linux-xfs@vger.kernel.org> # v7.1.0
Fixes: 074c18165ea339 ("xfs_scrub: fix spacemap scan for internal rt devices")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
 scrub/spacemap.c |   13 -------------
 1 file changed, 13 deletions(-)

diff --git a/scrub/spacemap.c b/scrub/spacemap.c
index 26d05163bde971..65d716374c9eb3 100644
--- a/scrub/spacemap.c
+++ b/scrub/spacemap.c
@@ -111,19 +111,6 @@ scan_ag_rmaps(
 	keys[1].fmr_offset = ULLONG_MAX;
 	keys[1].fmr_flags = UINT_MAX;
 
-	/*
-	 * fsmap for an internal rt volume treats physical ranges as offsets
-	 * into the underlying block device.  Shift the query range up by
-	 * @rtstart here to skip the synthetic "internal filesystem" fsmap.
-	 */
-	if (ctx->mnt.fsgeom.rtstart) {
-		uint64_t	offset = ctx->mnt.fsgeom.rtstart *
-					 ctx->mnt.fsgeom.blocksize;
-
-		keys[0].fmr_physical += offset;
-		keys[1].fmr_physical += offset;
-	}
-
 	if (sbx->aborted)
 		return;
 

Re: [PATCH] xfs_scrub: fix spacemap scan for data volume

[Christoph Hellwig]

On Mon, Jul 13, 2026 at 08:55:10AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> I don't know why this hunk got copied into scan_ag_rmaps on merge.  The
> original patch only touched scan_rtg_rmaps.  Get rid of this new
> inclusion because now it's broken for the data device.

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>