summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log.c
diff options
context:
space:
mode:
authorChristoph Hellwig2015-06-22 01:45:10 +0200
committerDave Chinner2015-06-22 01:45:10 +0200
commitb2a922cd6c2e3b9c2e36d48683ceb87a5bce8bb8 (patch)
treee6d0fbac49e962d59a452c188c13e239f985951e /fs/xfs/xfs_log.c
parentxfs: use void pointers in log validation helpers (diff)
downloadkernel-qcow2-linux-b2a922cd6c2e3b9c2e36d48683ceb87a5bce8bb8.tar.gz
kernel-qcow2-linux-b2a922cd6c2e3b9c2e36d48683ceb87a5bce8bb8.tar.xz
kernel-qcow2-linux-b2a922cd6c2e3b9c2e36d48683ceb87a5bce8bb8.zip
xfs: remove xfs_caddr_t
Just use char pointers directly instead of the confusing typedef to a pointer type. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r--fs/xfs/xfs_log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 2102dfa93e33..97374c349dcd 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1602,7 +1602,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);
@@ -3809,7 +3809,7 @@ xlog_verify_iclog(
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);