From: Darrick J. Wong Date: Mon, 13 Jul 2026 15:55:10 +0000 (-0700) Subject: xfs_scrub: fix spacemap scan for data volume X-Git-Tag: v7.1.1~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee7dc67a6aaf2a7ec3e63ebe230a67541ca671a8;p=thirdparty%2Fxfsprogs-dev.git xfs_scrub: fix spacemap scan for data volume 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" Reviewed-by: Christoph Hellwig --- diff --git a/scrub/spacemap.c b/scrub/spacemap.c index 26d05163b..65d716374 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;