]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs_scrub: fix spacemap scan for data volume
authorDarrick J. Wong <djwong@kernel.org>
Mon, 13 Jul 2026 15:55:10 +0000 (08:55 -0700)
committerAndrey Albershteyn <aalbersh@kernel.org>
Tue, 14 Jul 2026 09:27:25 +0000 (11:27 +0200)
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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
scrub/spacemap.c

index 26d05163bde9714ee475914a69c216b3ab9f269a..65d716374c9eb3ad98b831937650011d820c8867 100644 (file)
@@ -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;