1 files changed, 4 insertions, 8 deletions

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index ef8c31a14c92..cebcfcc06a93 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -634,10 +634,8 @@ xfs_iformat_extents(
                 xfs_validate_extents(ifp, nex, XFS_EXTFMT_INODE(ip));
                 for (i = 0; i < nex; i++, dp++) {
                         xfs_bmbt_rec_host_t *ep = xfs_iext_get_ext(ifp, i);
-                        ep->l0 = INT_GET(get_unaligned((__uint64_t*)&dp->l0),
-                                                                ARCH_CONVERT);
-                        ep->l1 = INT_GET(get_unaligned((__uint64_t*)&dp->l1),
-                                                                ARCH_CONVERT);
+                        ep->l0 = be64_to_cpu(get_unaligned(&dp->l0));
+                        ep->l1 = be64_to_cpu(get_unaligned(&dp->l1));
                 }
                 XFS_BMAP_TRACE_EXLIST(ip, nex, whichfork);
                 if (whichfork != XFS_DATA_FORK ||
@@ -2916,10 +2914,8 @@ xfs_iextents_copy(
                 }
 
                 /* Translate to on disk format */
-                put_unaligned(INT_GET(ep->l0, ARCH_CONVERT),
-                              (__uint64_t*)&dp->l0);
-                put_unaligned(INT_GET(ep->l1, ARCH_CONVERT),
-                              (__uint64_t*)&dp->l1);
+                put_unaligned(cpu_to_be64(ep->l0), &dp->l0);
+                put_unaligned(cpu_to_be64(ep->l1), &dp->l1);
                 dp++;
                 copied++;
         }