github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 23:22:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

xfs: add a xfs_groups_to_rfsbs helper

Browse Source 
Plus a rtgroup wrapper and use that to avoid overflows when converting
zone/rtg counts to block counts.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
Christoph Hellwig 2025-11-03 05:14:09 -05:00 committed by Carlos Maiolino
parent d8a823c6f0
commit 0ec73eb3f1
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/xfs/libxfs/xfs_group.h
View File

@ -98,6 +98,15 @@ xfs_group_max_blocks(
return xg->xg_mount->m_groups[xg->xg_type].blocks;
}
static inline xfs_rfsblock_t
xfs_groups_to_rfsbs(
struct xfs_mount *mp,
uint32_t nr_groups,
enum xfs_group_type type)
{
return (xfs_rfsblock_t)mp->m_groups[type].blocks * nr_groups;
}
static inline xfs_fsblock_t
xfs_group_start_fsb(
struct xfs_group *xg)

8
fs/xfs/libxfs/xfs_rtgroup.h
View File

@ -371,4 +371,12 @@ static inline int xfs_initialize_rtgroups(struct xfs_mount *mp,
# define xfs_rtgroup_get_geometry(rtg, rgeo) (-EOPNOTSUPP)
#endif /* CONFIG_XFS_RT */
static inline xfs_rfsblock_t
xfs_rtgs_to_rfsbs(
struct xfs_mount *mp,
uint32_t nr_groups)
{
return xfs_groups_to_rfsbs(mp, nr_groups, XG_TYPE_RTG);
}
#endif /* __LIBXFS_RTGROUP_H */

3
fs/xfs/xfs_zone_gc.c
View File

@ -181,8 +181,7 @@ xfs_zoned_need_gc(
available = xfs_estimate_freecounter(mp, XC_FREE_RTAVAILABLE);
if (available <
mp->m_groups[XG_TYPE_RTG].blocks *
(mp->m_max_open_zones - XFS_OPEN_GC_ZONES))
xfs_rtgs_to_rfsbs(mp, mp->m_max_open_zones - XFS_OPEN_GC_ZONES))
return true;
free = xfs_estimate_freecounter(mp, XC_FREE_RTEXTENTS);

8
fs/xfs/xfs_zone_space_resv.c
View File

@ -54,12 +54,10 @@ xfs_zoned_default_resblks(
{
switch (ctr) {
case XC_FREE_RTEXTENTS:
return (uint64_t)XFS_RESERVED_ZONES *
mp->m_groups[XG_TYPE_RTG].blocks +
mp->m_sb.sb_rtreserved;
return xfs_rtgs_to_rfsbs(mp, XFS_RESERVED_ZONES) +
mp->m_sb.sb_rtreserved;
case XC_FREE_RTAVAILABLE:
return (uint64_t)XFS_GC_ZONES *
mp->m_groups[XG_TYPE_RTG].blocks;
return xfs_rtgs_to_rfsbs(mp, XFS_GC_ZONES);
default:
ASSERT(0);
return 0;