xfs_repair: fix libxfs abstraction mess

Do some xfs -> libxfs callsite conversions to shut up xfs/437.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Andrey Albershteyn <aalbersh@kernel.org>

diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index dcb5dec0a7abd2c2efe0cc847003b5e79f30bb98..c5fcb5e3229ae4a5d3f286be10c55cf36b85877c 100644 (file)
--- 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 456076b9817d768d112b76bfeed594b14cd9f03a..206b0158f95f847023f9c9e11734b223ca2f3873 100644 (file)
--- 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