xfs_scrub: fix spacemap scan for data volume
PATCH 1/1 xfs_scrub: fix spacemap scan for data volume
From: Darrick J. Wong <[email protected]>
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 <[email protected]> # v7.1.0
Fixes 074c18165ea339 ("xfs_scrub: fix spacemap scan for internal rt devices")
Signed-off-by "Darrick J. Wong" <[email protected]>
--- scrub/spacemap.c | 13 ------------- 1 file changed, 13 deletions(-)
scrub/spacemap.c +0 -13
@@ -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 ;
Quoted 5 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
I don't know why this hunk got copied into
scan_ag_rmapson merge. The original patch only touchedscan_rtg_rmaps. Get rid of this new inclusion because now it's broken for the data device.
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>