[XFS] clean up some xfs_log_priv.h macros

- the various assign lsn macros are replaced by a single inline,
xlog_assign_lsn, which is equivalent to ASSIGN_ANY_LSN_HOST except
for a more sane calling convention. ASSIGN_LSN_DISK is replaced
by xlog_assign_lsn and a manual bytespap, and ASSIGN_LSN by the same,
except we pass the cycle and block arguments explicitly instead of a
log paramter. The latter two variants only had 2, respectively one
user anyway.
- the GET_CYCLE is replaced by a xlog_get_cycle inline with exactly the
same calling conventions.
- GET_CLIENT_ID is replaced by xlog_get_client_id which leaves away
the unused arch argument. Instead of conditional defintions
depending on host endianess we now do an unconditional swap and shift
then, which generates equal code.
- the unused XLOG_SET macro is removed.

SGI-PV: 971186
SGI-Modid: xfs-linux-melb:xfs-kern:29820a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index e603591b992..f27b6e93a68 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;