From: Darrick J. Wong Date: Fri, 25 Apr 2025 15:48:18 +0000 (-0700) Subject: xfs_repair: fix libxfs abstraction mess X-Git-Tag: v6.15.0~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72d5abe1d8c3cf184a1c53cea267c57e7957e6f9;p=thirdparty%2Fxfsprogs-dev.git xfs_repair: fix libxfs abstraction mess Do some xfs -> libxfs callsite conversions to shut up xfs/437. Signed-off-by: Darrick J. Wong Reviewed-by: Andrey Albershteyn --- diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h index dcb5dec0..c5fcb5e3 100644 --- a/libxfs/libxfs_api_defs.h +++ b/libxfs/libxfs_api_defs.h @@ -407,6 +407,7 @@ #define xfs_verify_rgbno libxfs_verify_rgbno #define xfs_verify_rtbno libxfs_verify_rtbno #define xfs_zero_extent libxfs_zero_extent +#define xfs_zone_validate libxfs_zone_validate /* Please keep this list alphabetized. */ diff --git a/repair/zoned.c b/repair/zoned.c index 456076b9..206b0158 100644 --- a/repair/zoned.c +++ b/repair/zoned.c @@ -30,7 +30,7 @@ report_zones_cb( } rgno = xfs_rtb_to_rgno(mp, zsbno); - rtg = xfs_rtgroup_grab(mp, rgno); + rtg = libxfs_rtgroup_grab(mp, rgno); if (!rtg) { do_error(_("realtime group not found for zone %u."), rgno); return; @@ -39,8 +39,8 @@ report_zones_cb( if (!rtg_rmap(rtg)) do_warn(_("no rmap inode for zone %u."), rgno); else - xfs_zone_validate(zone, rtg, &write_pointer); - xfs_rtgroup_rele(rtg); + libxfs_zone_validate(zone, rtg, &write_pointer); + libxfs_rtgroup_rele(rtg); } void