Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index 2c3ef20f8842..e73c332eb23f 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -843,7 +843,7 @@ xfs_btree_ptr_is_null(
         union xfs_btree_ptr     *ptr)
 {
         if (cur->bc_flags & XFS_BTREE_LONG_PTRS)
-                return be64_to_cpu(ptr->l) == NULLFSBLOCK;
+                return be64_to_cpu(ptr->l) == NULLDFSBNO;
         else
                 return be32_to_cpu(ptr->s) == NULLAGBLOCK;
 }
@@ -854,7 +854,7 @@ xfs_btree_set_ptr_null(
         union xfs_btree_ptr     *ptr)
 {
         if (cur->bc_flags & XFS_BTREE_LONG_PTRS)
-                ptr->l = cpu_to_be64(NULLFSBLOCK);
+                ptr->l = cpu_to_be64(NULLDFSBNO);
         else
                 ptr->s = cpu_to_be32(NULLAGBLOCK);
 }
@@ -918,8 +918,8 @@ xfs_btree_init_block(
         new->bb_numrecs = cpu_to_be16(numrecs);
 
         if (cur->bc_flags & XFS_BTREE_LONG_PTRS) {
-                new->bb_u.l.bb_leftsib = cpu_to_be64(NULLFSBLOCK);
-                new->bb_u.l.bb_rightsib = cpu_to_be64(NULLFSBLOCK);
+                new->bb_u.l.bb_leftsib = cpu_to_be64(NULLDFSBNO);
+                new->bb_u.l.bb_rightsib = cpu_to_be64(NULLDFSBNO);
         } else {
                 new->bb_u.s.bb_leftsib = cpu_to_be32(NULLAGBLOCK);
                 new->bb_u.s.bb_rightsib = cpu_to_be32(NULLAGBLOCK);
@@ -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)));
         }
 }
@@ -971,7 +971,7 @@ xfs_btree_ptr_to_daddr(
         union xfs_btree_ptr     *ptr)
 {
         if (cur->bc_flags & XFS_BTREE_LONG_PTRS) {
-                ASSERT(be64_to_cpu(ptr->l) != NULLFSBLOCK);
+                ASSERT(be64_to_cpu(ptr->l) != NULLDFSBNO);
 
                 return XFS_FSB_TO_DADDR(cur->bc_mp, be64_to_cpu(ptr->l));
         } else {
@@ -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);