summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log.c
diff options
context:
space:
mode:
authorChristoph Hellwig2015-06-22 01:43:32 +0200
committerDave Chinner2015-06-22 01:43:32 +0200
commitdb9d67d6b09e5d86da0c33da0d9dcb7998653c4f (patch)
tree67646b74117d33d8f2fbe4639fed4bdef8219ae5 /fs/xfs/xfs_log.c
parentxfs: fix remote symlinks on V5/CRC filesystems (diff)
downloadkernel-qcow2-linux-db9d67d6b09e5d86da0c33da0d9dcb7998653c4f.tar.gz
kernel-qcow2-linux-db9d67d6b09e5d86da0c33da0d9dcb7998653c4f.tar.xz
kernel-qcow2-linux-db9d67d6b09e5d86da0c33da0d9dcb7998653c4f.zip
xfs: remove __psint_t and __psunsigned_t
Replace uses of __psint_t with the proper uintptr_t and ptrdiff_t types, and remove the defintions of __psint_t and __psunsigned_t. 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.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index bcc7cfabb787..eafd83b9d937 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -3769,7 +3769,7 @@ xlog_verify_iclog(
xlog_in_core_2_t *xhdr;
xfs_caddr_t ptr;
xfs_caddr_t base_ptr;
- __psint_t field_offset;
+ ptrdiff_t field_offset;
__uint8_t clientid;
int len, i, j, k, op_len;
int idx;
@@ -3806,7 +3806,7 @@ xlog_verify_iclog(
ophead = (xlog_op_header_t *)ptr;
/* clientid is only 1 byte */
- field_offset = (__psint_t)
+ field_offset = (ptrdiff_t)
((xfs_caddr_t)&(ophead->oh_clientid) - base_ptr);
if (!syncing || (field_offset & 0x1ff)) {
clientid = ophead->oh_clientid;
@@ -3829,13 +3829,13 @@ xlog_verify_iclog(
(unsigned long)field_offset);
/* check length */
- field_offset = (__psint_t)
+ field_offset = (ptrdiff_t)
((xfs_caddr_t)&(ophead->oh_len) - 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);