1 files changed, 19 insertions, 21 deletions

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index c8d09ef81c4f..08d4fe46f0fa 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -109,7 +109,7 @@ xlog_ungrant_log_space(
 STATIC void
 xlog_verify_dest_ptr(
         struct xlog             *log,
-        char                    *ptr);
+        void                    *ptr);
 STATIC void
 xlog_verify_grant_tail(
         struct xlog *log);
@@ -1444,7 +1444,7 @@ xlog_alloc_log(
                 iclog->ic_bp = bp;
                 iclog->ic_data = bp->b_addr;
 #ifdef DEBUG
-                log->l_iclog_bak[i] = (xfs_caddr_t)&(iclog->ic_header);
+                log->l_iclog_bak[i] = &iclog->ic_header;
 #endif
                 head = &iclog->ic_header;
                 memset(head, 0, sizeof(xlog_rec_header_t));
@@ -1599,7 +1599,7 @@ xlog_pack_data(
         int                     i, j, k;
         int                     size = iclog->ic_offset + roundoff;
         __be32                  cycle_lsn;
-        xfs_caddr_t             dp;
+        char                    *dp;
 
         cycle_lsn = CYCLE_LSN_DISK(iclog->ic_header.h_lsn);
 
@@ -3661,7 +3661,7 @@ xlog_ticket_alloc(
 void
 xlog_verify_dest_ptr(
         struct xlog     *log,
-        char            *ptr)
+        void            *ptr)
 {
         int i;
         int good_ptr = 0;
@@ -3764,9 +3764,8 @@ xlog_verify_iclog(
         xlog_op_header_t        *ophead;
         xlog_in_core_t          *icptr;
         xlog_in_core_2_t        *xhdr;
-        xfs_caddr_t             ptr;
-        xfs_caddr_t             base_ptr;
-        __psint_t               field_offset;
+        void                    *base_ptr, *ptr, *p;
+        ptrdiff_t               field_offset;
         __uint8_t               clientid;
         int                     len, i, j, k, op_len;
         int                     idx;
@@ -3785,9 +3784,9 @@ xlog_verify_iclog(
         if (iclog->ic_header.h_magicno != cpu_to_be32(XLOG_HEADER_MAGIC_NUM))
                 xfs_emerg(log->l_mp, "%s: invalid magic num", __func__);
 
-        ptr = (xfs_caddr_t) &iclog->ic_header;
-        for (ptr += BBSIZE; ptr < ((xfs_caddr_t)&iclog->ic_header) + count;
-             ptr += BBSIZE) {
+        base_ptr = ptr = &iclog->ic_header;
+        p = &iclog->ic_header;
+        for (ptr += BBSIZE; ptr < base_ptr + count; ptr += BBSIZE) {
                 if (*(__be32 *)ptr == cpu_to_be32(XLOG_HEADER_MAGIC_NUM))
                         xfs_emerg(log->l_mp, "%s: unexpected magic num",
                                 __func__);
@@ -3795,20 +3794,19 @@ xlog_verify_iclog(
 
         /* check fields */
         len = be32_to_cpu(iclog->ic_header.h_num_logops);
-        ptr = iclog->ic_datap;
-        base_ptr = ptr;
-        ophead = (xlog_op_header_t *)ptr;
+        base_ptr = ptr = iclog->ic_datap;
+        ophead = ptr;
         xhdr = iclog->ic_data;
         for (i = 0; i < len; i++) {
-                ophead = (xlog_op_header_t *)ptr;
+                ophead = ptr;
 
                 /* clientid is only 1 byte */
-                field_offset = (__psint_t)
-                               ((xfs_caddr_t)&(ophead->oh_clientid) - base_ptr);
+                p = &ophead->oh_clientid;
+                field_offset = p - base_ptr;
                 if (!syncing || (field_offset & 0x1ff)) {
                         clientid = ophead->oh_clientid;
                 } else {
-                        idx = BTOBBT((xfs_caddr_t)&(ophead->oh_clientid) - iclog->ic_datap);
+                        idx = BTOBBT((char *)&ophead->oh_clientid - iclog->ic_datap);
                         if (idx >= (XLOG_HEADER_CYCLE_SIZE / BBSIZE)) {
                                 j = idx / (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
                                 k = idx % (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
@@ -3826,13 +3824,13 @@ xlog_verify_iclog(
                                 (unsigned long)field_offset);
 
                 /* check length */
-                field_offset = (__psint_t)
-                               ((xfs_caddr_t)&(ophead->oh_len) - base_ptr);
+                p = &ophead->oh_len;
+                field_offset = p - base_ptr;
                 if (!syncing || (field_offset & 0x1ff)) {
                         op_len = be32_to_cpu(ophead->oh_len);
                 } else {
-                        idx = BTOBBT((__psint_t)&ophead->oh_len -
-                                    (__psint_t)iclog->ic_datap);
+                        idx = BTOBBT((uintptr_t)&ophead->oh_len -
+                                    (uintptr_t)iclog->ic_datap);
                         if (idx >= (XLOG_HEADER_CYCLE_SIZE / BBSIZE)) {
                                 j = idx / (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
                                 k = idx % (XLOG_HEADER_CYCLE_SIZE / BBSIZE);