3 files changed, 16 insertions, 17 deletions

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 90d96caf7200..5ff4643b72c7 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1829,7 +1829,7 @@ xlog_write(xfs_mount_t *	mp,
              */
             if (ticket->t_flags & XLOG_TIC_INITED) {
                 logop_head              = (xlog_op_header_t *)ptr;
-                INT_SET(logop_head->oh_tid, ARCH_CONVERT, ticket->t_tid);
+                logop_head->oh_tid      = cpu_to_be32(ticket->t_tid);
                 logop_head->oh_clientid = ticket->t_clientid;
                 logop_head->oh_len      = 0;
                 logop_head->oh_flags    = XLOG_START_TRANS;
@@ -1843,7 +1843,7 @@ xlog_write(xfs_mount_t *	mp,
 
             /* Copy log operation header directly into data section */
             logop_head                  = (xlog_op_header_t *)ptr;
-            INT_SET(logop_head->oh_tid, ARCH_CONVERT, ticket->t_tid);
+            logop_head->oh_tid          = cpu_to_be32(ticket->t_tid);
             logop_head->oh_clientid     = ticket->t_clientid;
             logop_head->oh_res2         = 0;
 
@@ -1878,13 +1878,14 @@ xlog_write(xfs_mount_t *	mp,
 
             copy_off = partial_copy_len;
             if (need_copy <= iclog->ic_size - log_offset) { /*complete write */
-                INT_SET(logop_head->oh_len, ARCH_CONVERT, copy_len = need_copy);
+                copy_len = need_copy;
+                logop_head->oh_len = cpu_to_be32(copy_len);
                 if (partial_copy)
                     logop_head->oh_flags|= (XLOG_END_TRANS|XLOG_WAS_CONT_TRANS);
                 partial_copy_len = partial_copy = 0;
             } else {                                        /* partial write */
                 copy_len = iclog->ic_size - log_offset;
-                INT_SET(logop_head->oh_len, ARCH_CONVERT, copy_len);
+                logop_head->oh_len = cpu_to_be32(copy_len);
                 logop_head->oh_flags |= XLOG_CONTINUE_TRANS;
                 if (partial_copy)
                         logop_head->oh_flags |= XLOG_WAS_CONT_TRANS;
@@ -3504,7 +3505,7 @@ xlog_verify_iclog(xlog_t	 *log,
                 field_offset = (__psint_t)
                                ((xfs_caddr_t)&(ophead->oh_len) - base_ptr);
                 if (syncing == B_FALSE || (field_offset & 0x1ff)) {
-                        op_len = INT_GET(ophead->oh_len, ARCH_CONVERT);
+                        op_len = be32_to_cpu(ophead->oh_len);
                 } else {
                         idx = BTOBBT((__psint_t)&ophead->oh_len -
                                     (__psint_t)iclog->ic_datap);
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index e391f58deae1..d555aebca9bc 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -265,11 +265,11 @@ typedef struct xlog_ticket {
 
 
 typedef struct xlog_op_header {
-        xlog_tid_t oh_tid;      /* transaction id of operation  :  4 b */
-        int        oh_len;      /* bytes in data region         :  4 b */
-        __uint8_t  oh_clientid; /* who sent me this             :  1 b */
-        __uint8_t  oh_flags;    /*                              :  1 b */
-        ushort     oh_res2;     /* 32 bit align                 :  2 b */
+        __be32     oh_tid;      /* transaction id of operation  :  4 b */
+        __be32     oh_len;      /* bytes in data region         :  4 b */
+        __u8       oh_clientid; /* who sent me this             :  1 b */
+        __u8       oh_flags;    /*                              :  1 b */
+        __u16      oh_res2;     /* 32 bit align                 :  2 b */
 } xlog_op_header_t;
 
 
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index e603591b9922..f27b6e93a682 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2916,7 +2916,7 @@ xlog_recover_process_data(
                         ASSERT(0);
                         return (XFS_ERROR(EIO));
                 }
-                tid = INT_GET(ohead->oh_tid, ARCH_CONVERT);
+                tid = be32_to_cpu(ohead->oh_tid);
                 hash = XLOG_RHASH(tid);
                 trans = xlog_recover_find_tid(rhash[hash], tid);
                 if (trans == NULL) {               /* not found; add new tid */
@@ -2924,7 +2924,7 @@ xlog_recover_process_data(
                                 xlog_recover_new_tid(&rhash[hash], tid,
                                         INT_GET(rhead->h_lsn, ARCH_CONVERT));
                 } else {
-                        ASSERT(dp+INT_GET(ohead->oh_len, ARCH_CONVERT) <= lp);
+                        ASSERT(dp + be32_to_cpu(ohead->oh_len) <= lp);
                         flags = ohead->oh_flags & ~XLOG_END_TRANS;
                         if (flags & XLOG_WAS_CONT_TRANS)
                                 flags &= ~XLOG_CONTINUE_TRANS;
@@ -2938,8 +2938,7 @@ xlog_recover_process_data(
                                 break;
                         case XLOG_WAS_CONT_TRANS:
                                 error = xlog_recover_add_to_cont_trans(trans,
-                                                dp, INT_GET(ohead->oh_len,
-                                                        ARCH_CONVERT));
+                                                dp, be32_to_cpu(ohead->oh_len));
                                 break;
                         case XLOG_START_TRANS:
                                 xlog_warn(
@@ -2950,8 +2949,7 @@ xlog_recover_process_data(
                         case 0:
                         case XLOG_CONTINUE_TRANS:
                                 error = xlog_recover_add_to_trans(trans,
-                                                dp, INT_GET(ohead->oh_len,
-                                                        ARCH_CONVERT));
+                                                dp, be32_to_cpu(ohead->oh_len));
                                 break;
                         default:
                                 xlog_warn(
@@ -2963,7 +2961,7 @@ xlog_recover_process_data(
                         if (error)
                                 return error;
                 }
-                dp += INT_GET(ohead->oh_len, ARCH_CONVERT);
+                dp += be32_to_cpu(ohead->oh_len);
                 num_logops--;
         }
         return 0;