diff mbox series

[40/43] xfs_spaceman: handle internal RT devices

Message ID	20250414053629.360672-41-hch@lst.de (mailing list archive)
State	New
Headers	show Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86E802CCC1 for <linux-xfs@vger.kernel.org>; Mon, 14 Apr 2025 05:38:24 +0000 (UTC) From: Christoph Hellwig <hch@lst.de> To: Andrey Albershteyn <aalbersh@kernel.org> Cc: "Darrick J . Wong" <djwong@kernel.org>, Hans Holmberg <hans.holmberg@wdc.com>, linux-xfs@vger.kernel.org Subject: [PATCH 40/43] xfs_spaceman: handle internal RT devices Date: Mon, 14 Apr 2025 07:36:23 +0200 Message-ID: <20250414053629.360672-41-hch@lst.de> In-Reply-To: <20250414053629.360672-1-hch@lst.de> References: <20250414053629.360672-1-hch@lst.de> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/43] xfs: generalize the freespace and reserved blocks handling \| expand [01/43] xfs: generalize the freespace and reserved blocks handling [02/43] FIXUP: xfs: generalize the freespace and reserved blocks handling [03/43] xfs: make metabtree reservations global [04/43] FIXUP: xfs: make metabtree reservations global [05/43] xfs: reduce metafile reservations [06/43] xfs: add a rtg_blocks helper [07/43] xfs: move xfs_bmapi_reserve_delalloc to xfs_iomap.c [08/43] xfs: support XFS_BMAPI_REMAP in xfs_bmap_del_extent_delay [09/43] xfs: add a xfs_rtrmap_highest_rgbno helper [10/43] xfs: define the zoned on-disk format [11/43] FIXUP: xfs: define the zoned on-disk format [12/43] xfs: allow internal RT devices for zoned mode [13/43] FIXUP: xfs: allow internal RT devices for zoned mode [14/43] xfs: export zoned geometry via XFS_FSOP_GEOM [15/43] xfs: disable sb_frextents for zoned file systems [16/43] xfs: parse and validate hardware zone information [17/43] FIXUP: xfs: parse and validate hardware zone information [18/43] xfs: add the zoned space allocator [19/43] xfs: add support for zoned space reservations [20/43] FIXUP: xfs: add support for zoned space reservations [21/43] xfs: implement zoned garbage collection [22/43] xfs: enable fsmap reporting for internal RT devices [23/43] xfs: enable the zoned RT device feature [24/43] xfs: support zone gaps [25/43] FIXUP: xfs: support zone gaps [26/43] libfrog: report the zoned geometry [27/43] xfs_repair: support repairing zoned file systems [28/43] xfs_repair: fix the RT device check in process_dinode_int [29/43] xfs_repair: validate rt groups vs reported hardware zones [30/43] xfs_mkfs: factor out a validate_rtgroup_geometry helper [31/43] xfs_mkfs: support creating file system with zoned RT devices [32/43] xfs_mkfs: calculate zone overprovisioning when specifying size [33/43] xfs_mkfs: default to rtinherit=1 for zoned file systems [34/43] xfs_mkfs: reflink conflicts with zoned file systems for now [35/43] xfs_mkfs: document the new zoned options in the man page [36/43] man: document XFS_FSOP_GEOM_FLAGS_ZONED [37/43] xfs_io: correctly report RGs with internal rt dev in bmap output [38/43] xfs_io: don't re-query fs_path information in fsmap_f [39/43] xfs_io: handle internal RT devices in fsmap output [40/43] xfs_spaceman: handle internal RT devices [41/43] xfs_scrub: support internal RT device [42/43] xfs_mdrestore: support internal RT devices [43/43] xfs_growfs: support internal RT devices

Commit Message

Christoph Hellwig April 14, 2025, 5:36 a.m. UTC

Handle the synthetic fmr_device values for fsmap.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
---
 spaceman/freesp.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/spaceman/freesp.c b/spaceman/freesp.c
index dfbec52a7160..9ad321c4843f 100644
--- a/spaceman/freesp.c
+++ b/spaceman/freesp.c
@@ -140,12 +140,19 @@  scan_ag(
 	if (agno != NULLAGNUMBER) {
 		l->fmr_physical = cvt_agbno_to_b(xfd, agno, 0);
 		h->fmr_physical = cvt_agbno_to_b(xfd, agno + 1, 0);
-		l->fmr_device = h->fmr_device = file->fs_path.fs_datadev;
+		if (file->xfd.fsgeom.rtstart)
+			l->fmr_device = XFS_DEV_DATA;
+		else
+			l->fmr_device = file->fs_path.fs_datadev;
 	} else {
 		l->fmr_physical = 0;
 		h->fmr_physical = ULLONG_MAX;
-		l->fmr_device = h->fmr_device = file->fs_path.fs_rtdev;
+		if (file->xfd.fsgeom.rtstart)
+			l->fmr_device = XFS_DEV_RT;
+		else
+			l->fmr_device = file->fs_path.fs_rtdev;
 	}
+		h->fmr_device = l->fmr_device;
 	h->fmr_owner = ULLONG_MAX;
 	h->fmr_flags = UINT_MAX;
 	h->fmr_offset = ULLONG_MAX;