1 files changed, 27 insertions, 32 deletions

diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index e5e91e9c7e89..093fac476bda 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -1127,8 +1127,7 @@ xfs_attr_leaf_list(xfs_attr_list_context_t *context)
                 return(error);
         ASSERT(bp != NULL);
         leaf = bp->data;
-        if (unlikely(INT_GET(leaf->hdr.info.magic, ARCH_CONVERT)
-                                                != XFS_ATTR_LEAF_MAGIC)) {
+        if (unlikely(be16_to_cpu(leaf->hdr.info.magic) != XFS_ATTR_LEAF_MAGIC)) {
                 XFS_CORRUPTION_ERROR("xfs_attr_leaf_list", XFS_ERRLEVEL_LOW,
                                      context->dp->i_mount, leaf);
                 xfs_da_brelse(NULL, bp);
@@ -1541,8 +1540,8 @@ xfs_attr_node_removename(xfs_da_args_t *args)
                                                      XFS_ATTR_FORK);
                 if (error)
                         goto out;
-                ASSERT(INT_GET(((xfs_attr_leafblock_t *)
-                                      bp->data)->hdr.info.magic, ARCH_CONVERT)
+                ASSERT(be16_to_cpu(((xfs_attr_leafblock_t *)
+                                      bp->data)->hdr.info.magic)
                                                        == XFS_ATTR_LEAF_MAGIC);
 
                 if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
@@ -1763,7 +1762,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
                         return(error);
                 if (bp) {
                         node = bp->data;
-                        switch (INT_GET(node->hdr.info.magic, ARCH_CONVERT)) {
+                        switch (be16_to_cpu(node->hdr.info.magic)) {
                         case XFS_DA_NODE_MAGIC:
                                 xfs_attr_trace_l_cn("wrong blk", context, node);
                                 xfs_da_brelse(NULL, bp);
@@ -1771,18 +1770,14 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
                                 break;
                         case XFS_ATTR_LEAF_MAGIC:
                                 leaf = bp->data;
-                                if (cursor->hashval >
-                                    INT_GET(leaf->entries[
-                                         INT_GET(leaf->hdr.count,
-                                                ARCH_CONVERT)-1].hashval,
-                                                        ARCH_CONVERT)) {
+                                if (cursor->hashval > be32_to_cpu(leaf->entries[
+                                    be16_to_cpu(leaf->hdr.count)-1].hashval)) {
                                         xfs_attr_trace_l_cl("wrong blk",
                                                            context, leaf);
                                         xfs_da_brelse(NULL, bp);
                                         bp = NULL;
                                 } else if (cursor->hashval <=
-                                             INT_GET(leaf->entries[0].hashval,
-                                                        ARCH_CONVERT)) {
+                                             be32_to_cpu(leaf->entries[0].hashval)) {
                                         xfs_attr_trace_l_cl("maybe wrong blk",
                                                            context, leaf);
                                         xfs_da_brelse(NULL, bp);
@@ -1817,10 +1812,10 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
                                 return(XFS_ERROR(EFSCORRUPTED));
                         }
                         node = bp->data;
-                        if (INT_GET(node->hdr.info.magic, ARCH_CONVERT)
+                        if (be16_to_cpu(node->hdr.info.magic)
                                                         == XFS_ATTR_LEAF_MAGIC)
                                 break;
-                        if (unlikely(INT_GET(node->hdr.info.magic, ARCH_CONVERT)
+                        if (unlikely(be16_to_cpu(node->hdr.info.magic)
                                                         != XFS_DA_NODE_MAGIC)) {
                                 XFS_CORRUPTION_ERROR("xfs_attr_node_list(3)",
                                                      XFS_ERRLEVEL_LOW,
@@ -1830,19 +1825,17 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
                                 return(XFS_ERROR(EFSCORRUPTED));
                         }
                         btree = node->btree;
-                        for (i = 0;
-                                i < INT_GET(node->hdr.count, ARCH_CONVERT);
+                        for (i = 0; i < be16_to_cpu(node->hdr.count);
                                                                 btree++, i++) {
                                 if (cursor->hashval
-                                                <= INT_GET(btree->hashval,
-                                                            ARCH_CONVERT)) {
-                                        cursor->blkno = INT_GET(btree->before, ARCH_CONVERT);
+                                                <= be32_to_cpu(btree->hashval)) {
+                                        cursor->blkno = be32_to_cpu(btree->before);
                                         xfs_attr_trace_l_cb("descending",
                                                             context, btree);
                                         break;
                                 }
                         }
-                        if (i == INT_GET(node->hdr.count, ARCH_CONVERT)) {
+                        if (i == be16_to_cpu(node->hdr.count)) {
                                 xfs_da_brelse(NULL, bp);
                                 return(0);
                         }
@@ -1858,7 +1851,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
          */
         for (;;) {
                 leaf = bp->data;
-                if (unlikely(INT_GET(leaf->hdr.info.magic, ARCH_CONVERT)
+                if (unlikely(be16_to_cpu(leaf->hdr.info.magic)
                                                 != XFS_ATTR_LEAF_MAGIC)) {
                         XFS_CORRUPTION_ERROR("xfs_attr_node_list(4)",
                                              XFS_ERRLEVEL_LOW,
@@ -1869,7 +1862,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
                 error = xfs_attr_leaf_list_int(bp, context);
                 if (error || !leaf->hdr.info.forw)
                         break;  /* not really an error, buffer full or EOF */
-                cursor->blkno = INT_GET(leaf->hdr.info.forw, ARCH_CONVERT);
+                cursor->blkno = be32_to_cpu(leaf->hdr.info.forw);
                 xfs_da_brelse(NULL, bp);
                 error = xfs_da_read_buf(NULL, context->dp, cursor->blkno, -1,
                                               &bp, XFS_ATTR_FORK);
@@ -2232,9 +2225,10 @@ xfs_attr_trace_l_cn(char *where, struct xfs_attr_list_context *context,
                                 : 0,
                 (__psunsigned_t)context->dupcnt,
                 (__psunsigned_t)context->flags,
-                (__psunsigned_t)INT_GET(node->hdr.count, ARCH_CONVERT),
-                (__psunsigned_t)INT_GET(node->btree[0].hashval, ARCH_CONVERT),
-                (__psunsigned_t)INT_GET(node->btree[INT_GET(node->hdr.count, ARCH_CONVERT)-1].hashval, ARCH_CONVERT));
+                (__psunsigned_t)be16_to_cpu(node->hdr.count),
+                (__psunsigned_t)be32_to_cpu(node->btree[0].hashval),
+                (__psunsigned_t)be32_to_cpu(node->btree[
+                                    be16_to_cpu(node->hdr.count)-1].hashval));
 }
 
 /*
@@ -2261,8 +2255,8 @@ xfs_attr_trace_l_cb(char *where, struct xfs_attr_list_context *context,
                                 : 0,
                 (__psunsigned_t)context->dupcnt,
                 (__psunsigned_t)context->flags,
-                (__psunsigned_t)INT_GET(btree->hashval, ARCH_CONVERT),
-                (__psunsigned_t)INT_GET(btree->before, ARCH_CONVERT),
+                (__psunsigned_t)be32_to_cpu(btree->hashval),
+                (__psunsigned_t)be32_to_cpu(btree->before),
                 (__psunsigned_t)NULL);
 }
 
@@ -2290,9 +2284,10 @@ xfs_attr_trace_l_cl(char *where, struct xfs_attr_list_context *context,
                                 : 0,
                 (__psunsigned_t)context->dupcnt,
                 (__psunsigned_t)context->flags,
-                (__psunsigned_t)INT_GET(leaf->hdr.count, ARCH_CONVERT),
-                (__psunsigned_t)INT_GET(leaf->entries[0].hashval, ARCH_CONVERT),
-                (__psunsigned_t)INT_GET(leaf->entries[INT_GET(leaf->hdr.count, ARCH_CONVERT)-1].hashval, ARCH_CONVERT));
+                (__psunsigned_t)be16_to_cpu(leaf->hdr.count),
+                (__psunsigned_t)be32_to_cpu(leaf->entries[0].hashval),
+                (__psunsigned_t)be32_to_cpu(leaf->entries[
+                                be16_to_cpu(leaf->hdr.count)-1].hashval));
 }
 
 /*
@@ -2522,7 +2517,7 @@ attr_user_capable(
         struct vnode    *vp,
         cred_t          *cred)
 {
-        struct inode    *inode = LINVFS_GET_IP(vp);
+        struct inode    *inode = vn_to_inode(vp);
 
         if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
                 return -EPERM;
@@ -2540,7 +2535,7 @@ attr_trusted_capable(
         struct vnode    *vp,
         cred_t          *cred)
 {
-        struct inode    *inode = LINVFS_GET_IP(vp);
+        struct inode    *inode = vn_to_inode(vp);
 
         if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
                 return -EPERM;