diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-01-04 13:58:53 -0600 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2018-01-04 13:58:53 -0600 |
| commit | 532d03d551ffc70644832cb4f9a64b941e148f56 (patch) | |
| tree | 74018de77c71d70adaebf9a2c09816d823e5a464 | |
| parent | 945e47e2fcc5d1cec693122286da06d8ab829c52 (diff) | |
| download | xfsprogs-dev-532d03d551ffc70644832cb4f9a64b941e148f56.tar.gz | |
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>
| -rw-r--r-- | libxfs/libxfs_api_defs.h | 2 | ||||
| -rw-r--r-- | repair/dino_chunks.c | 2 | ||||
| -rw-r--r-- | repair/phase6.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h index 5d2ca2fbac..d2ab02a5dc 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 a3909ac8b1..17de95f53f 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 b326929543..1a398aa127 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), |