1 files changed, 3 insertions, 3 deletions

diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index 2c3ef20f8842..4681519ded91 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -960,7 +960,7 @@ xfs_btree_buf_to_ptr(
                 ptr->l = cpu_to_be64(XFS_DADDR_TO_FSB(cur->bc_mp,
                                         XFS_BUF_ADDR(bp)));
         else {
-                ptr->s = cpu_to_be32(XFS_DADDR_TO_AGBNO(cur->bc_mp,
+                ptr->s = cpu_to_be32(xfs_daddr_to_agbno(cur->bc_mp,
                                         XFS_BUF_ADDR(bp)));
         }
 }
@@ -2454,7 +2454,7 @@ xfs_btree_new_iroot(
         xfs_btree_log_ptrs(cur, cbp, 1, be16_to_cpu(cblock->bb_numrecs));
 
         *logflags |=
-                XFS_ILOG_CORE | XFS_ILOG_FBROOT(cur->bc_private.b.whichfork);
+                XFS_ILOG_CORE | xfs_ilog_fbroot(cur->bc_private.b.whichfork);
         *stat = 1;
         XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
         return 0;
@@ -3048,7 +3048,7 @@ xfs_btree_kill_iroot(
         cur->bc_bufs[level - 1] = NULL;
         be16_add_cpu(&block->bb_level, -1);
         xfs_trans_log_inode(cur->bc_tp, ip,
-                XFS_ILOG_CORE | XFS_ILOG_FBROOT(cur->bc_private.b.whichfork));
+                XFS_ILOG_CORE | xfs_ilog_fbroot(cur->bc_private.b.whichfork));
         cur->bc_nlevels--;
 out0:
         XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);