xfs_repair: fix libxfs namespace problems

Call libxfs_ functions, not xfs_ functions.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index 5d2ca2fbac9abc350a2b4d7e6973ad531672e4af..d2ab02a5dc20ebce196175e6265694dfe8b354d8 100644 (file)
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -116,7 +116,7 @@
 #define xfs_rmap_irec_offset_unpack    libxfs_rmap_irec_offset_unpack
 #define xfs_rmapbt_init_cursor         libxfs_rmapbt_init_cursor
 #define xfs_btree_del_cursor           libxfs_btree_del_cursor
-
+#define xfs_mode_to_ftype              libxfs_mode_to_ftype
 
 #define xfs_log_sb                     libxfs_log_sb
 #define xfs_sb_from_disk               libxfs_sb_from_disk

diff --git a/repair/dino_chunks.c b/repair/dino_chunks.c
index a3909ac8b1c4d20cf6572f40ed860e8c11a594c5..17de95f53fd07badd41739e933768e4dd83792e1 100644 (file)
--- a/repair/dino_chunks.c
+++ b/repair/dino_chunks.c
@@ -845,7 +845,7 @@ next_readbuf:
                         * phase 6.
                         */
                        set_inode_ftype(ino_rec, irec_offset,
-                               xfs_mode_to_ftype(be16_to_cpu(dino->di_mode)));
+                               libxfs_mode_to_ftype(be16_to_cpu(dino->di_mode)));
 
                        /*
                         * store on-disk nlink count for comparing in phase 7

diff --git a/repair/phase6.c b/repair/phase6.c
index b3269295433542d6fae02e78ebe223df4393cb17..1a398aa127c2b47c951e7c2e191654413bcb2504 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1081,7 +1081,7 @@ mv_orphanage(
        if ((err = -libxfs_iget(mp, NULL, ino, 0, &ino_p)))
                do_error(_("%d - couldn't iget disconnected inode\n"), err);
 
-       xname.type = xfs_mode_to_ftype(VFS_I(ino_p)->i_mode);
+       xname.type = libxfs_mode_to_ftype(VFS_I(ino_p)->i_mode);
 
        if (isa_dir)  {
                irec = find_inode_rec(mp, XFS_INO_TO_AGNO(mp, orphanage_ino),