UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Christoph Hellwig 2015-06-22 09:43:32 +10:00 committed by Dave Chinner
parent 2ac56d3d4b
commit db9d67d6b0
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/xfs_extfree_item.c
View File

@ -239,7 +239,7 @@ xfs_efi_init(
xfs_log_item_init(mp, &efip->efi_item, XFS_LI_EFI, &xfs_efi_item_ops); xfs_log_item_init(mp, &efip->efi_item, XFS_LI_EFI, &xfs_efi_item_ops);
efip->efi_format.efi_nextents = nextents; efip->efi_format.efi_nextents = nextents;
efip->efi_format.efi_id = (__psint_t)(void*)efip; efip->efi_format.efi_id = (uintptr_t)(void *)efip;
atomic_set(&efip->efi_next_extent, 0); atomic_set(&efip->efi_next_extent, 0);
atomic_set(&efip->efi_refcount, 2); atomic_set(&efip->efi_refcount, 2);

11
fs/xfs/xfs_linux.h
View File

@ -41,17 +41,6 @@ typedef char * xfs_caddr_t; /* <core address> type */
typedef __u32 xfs_dev_t; typedef __u32 xfs_dev_t;
typedef __u32 xfs_nlink_t; typedef __u32 xfs_nlink_t;
/* __psint_t is the same size as a pointer */
#if (BITS_PER_LONG == 32)
typedef __int32_t __psint_t;
typedef __uint32_t __psunsigned_t;
#elif (BITS_PER_LONG == 64)
typedef __int64_t __psint_t;
typedef __uint64_t __psunsigned_t;
#else
#error BITS_PER_LONG must be 32 or 64
#endif
#include "xfs_types.h" #include "xfs_types.h"
#include "kmem.h" #include "kmem.h"

10
fs/xfs/xfs_log.c
View File

@ -3769,7 +3769,7 @@ xlog_verify_iclog(
xlog_in_core_2_t *xhdr; xlog_in_core_2_t *xhdr;
xfs_caddr_t ptr; xfs_caddr_t ptr;
xfs_caddr_t base_ptr; xfs_caddr_t base_ptr;
__psint_t field_offset; ptrdiff_t field_offset;
__uint8_t clientid; __uint8_t clientid;
int len, i, j, k, op_len; int len, i, j, k, op_len;
int idx; int idx;
@ -3806,7 +3806,7 @@ xlog_verify_iclog(
ophead = (xlog_op_header_t *)ptr; ophead = (xlog_op_header_t *)ptr;
/* clientid is only 1 byte */ /* clientid is only 1 byte */
field_offset = (__psint_t) field_offset = (ptrdiff_t)
((xfs_caddr_t)&(ophead->oh_clientid) - base_ptr); ((xfs_caddr_t)&(ophead->oh_clientid) - base_ptr);
if (!syncing || (field_offset & 0x1ff)) { if (!syncing || (field_offset & 0x1ff)) {
clientid = ophead->oh_clientid; clientid = ophead->oh_clientid;
@ -3829,13 +3829,13 @@ xlog_verify_iclog(
(unsigned long)field_offset); (unsigned long)field_offset);
/* check length */ /* check length */
field_offset = (__psint_t) field_offset = (ptrdiff_t)
((xfs_caddr_t)&(ophead->oh_len) - base_ptr); ((xfs_caddr_t)&(ophead->oh_len) - base_ptr);
if (!syncing || (field_offset & 0x1ff)) { if (!syncing || (field_offset & 0x1ff)) {
op_len = be32_to_cpu(ophead->oh_len); op_len = be32_to_cpu(ophead->oh_len);
} else { } else {
idx = BTOBBT((__psint_t)&ophead->oh_len - idx = BTOBBT((uintptr_t)&ophead->oh_len -
(__psint_t)iclog->ic_datap); (uintptr_t)iclog->ic_datap);
if (idx >= (XLOG_HEADER_CYCLE_SIZE / BBSIZE)) { if (idx >= (XLOG_HEADER_CYCLE_SIZE / BBSIZE)) {
j = idx / (XLOG_HEADER_CYCLE_SIZE / BBSIZE); j = idx / (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
k = idx % (XLOG_HEADER_CYCLE_SIZE / BBSIZE); k = idx % (XLOG_HEADER_CYCLE_SIZE / BBSIZE);

6
fs/xfs/xfs_trans_ail.c
View File

@ -159,7 +159,7 @@ xfs_trans_ail_cursor_next(
{ {
struct xfs_log_item *lip = cur->item; struct xfs_log_item *lip = cur->item;
if ((__psint_t)lip & 1) if ((uintptr_t)lip & 1)
lip = xfs_ail_min(ailp); lip = xfs_ail_min(ailp);
if (lip) if (lip)
cur->item = xfs_ail_next(ailp, lip); cur->item = xfs_ail_next(ailp, lip);
@ -196,7 +196,7 @@ xfs_trans_ail_cursor_clear(
list_for_each_entry(cur, &ailp->xa_cursors, list) { list_for_each_entry(cur, &ailp->xa_cursors, list) {
if (cur->item == lip) if (cur->item == lip)
cur->item = (struct xfs_log_item *) cur->item = (struct xfs_log_item *)
((__psint_t)cur->item | 1); ((uintptr_t)cur->item | 1);
} }
} }
@ -287,7 +287,7 @@ xfs_ail_splice(
* find the place in the AIL where the items belong. * find the place in the AIL where the items belong.
*/ */
lip = cur ? cur->item : NULL; lip = cur ? cur->item : NULL;
if (!lip || (__psint_t) lip & 1) if (!lip || (uintptr_t)lip & 1)
lip = __xfs_trans_ail_cursor_last(ailp, lsn); lip = __xfs_trans_ail_cursor_last(ailp, lsn);
/* /*