From: Darrick J. Wong Date: Thu, 4 Jan 2018 19:58:53 +0000 (-0600) Subject: xfs_repair: fix libxfs namespace problems X-Git-Tag: v4.15.0-rc1~58 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=532d03d551ffc70644832cb4f9a64b941e148f56;p=thirdparty%2Fxfsprogs-dev.git xfs_repair: fix libxfs namespace problems Call libxfs_ functions, not xfs_ functions. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h index 5d2ca2fba..d2ab02a5d 100644 --- 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 a3909ac8b..17de95f53 100644 --- 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 b32692954..1a398aa12 100644 --- 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),