[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:29819a

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, 8 insertions, 6 deletions

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 615638201284..90d96caf7200 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1161,7 +1161,7 @@ xlog_alloc_log(xfs_mount_t	*mp,
         log->l_flags       |= XLOG_ACTIVE_RECOVERY;
 
         log->l_prev_block  = -1;
-        ASSIGN_ANY_LSN_HOST(log->l_tail_lsn, 1, 0);
+        log->l_tail_lsn    = xlog_assign_lsn(1, 0);
         /* log->l_tail_lsn = 0x100000000LL; cycle = 1; current block = 0 */
         log->l_last_sync_lsn = log->l_tail_lsn;
         log->l_curr_cycle  = 1;     /* 0 is bad since this is initial value */
@@ -1326,8 +1326,7 @@ xlog_grant_push_ail(xfs_mount_t	*mp,
             threshold_block -= log->l_logBBsize;
             threshold_cycle += 1;
         }
-        ASSIGN_ANY_LSN_HOST(threshold_lsn, threshold_cycle,
-                       threshold_block);
+        threshold_lsn = xlog_assign_lsn(threshold_cycle, threshold_block);
 
         /* Don't pass in an lsn greater than the lsn of the last
          * log record known to be on disk.
@@ -2393,7 +2392,8 @@ restart:
                                     log->l_iclog_hsize,
                                     XLOG_REG_TYPE_LRHEADER);
                 INT_SET(head->h_cycle, ARCH_CONVERT, log->l_curr_cycle);
-                ASSIGN_LSN(head->h_lsn, log);
+                INT_SET(head->h_lsn, ARCH_CONVERT,
+                        xlog_assign_lsn(log->l_curr_cycle, log->l_curr_block));
                 ASSERT(log->l_curr_block >= 0);
         }
 
@@ -3488,9 +3488,11 @@ xlog_verify_iclog(xlog_t	 *log,
                         if (idx >= (XLOG_HEADER_CYCLE_SIZE / BBSIZE)) {
                                 j = idx / (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
                                 k = idx % (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
-                                clientid = GET_CLIENT_ID(xhdr[j].hic_xheader.xh_cycle_data[k], ARCH_CONVERT);
+                                clientid = xlog_get_client_id(
+                                        xhdr[j].hic_xheader.xh_cycle_data[k]);
                         } else {
-                                clientid = GET_CLIENT_ID(iclog->ic_header.h_cycle_data[idx], ARCH_CONVERT);
+                                clientid = xlog_get_client_id(
+                                        iclog->ic_header.h_cycle_data[idx]);
                         }
                 }
                 if (clientid != XFS_TRANSACTION && clientid != XFS_LOG)