xfs: remove u_int* type usage

Use the uint* types instead of the u_int* types.  This will (hopefully)
pair with an xfsprogs cleanup.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index 2e047e76db2f030d0e6e4bfde8cdfff1e9540cd2..1acb584fc5f7af4d0a893f59d6638f3cd7da1eac 100644 (file)
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -1147,7 +1147,7 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
  * Dquot and dquot block format definitions
  */
 #define XFS_DQUOT_MAGIC                0x4451          /* 'DQ' */
-#define XFS_DQUOT_VERSION      (u_int8_t)0x01  /* latest version number */
+#define XFS_DQUOT_VERSION      (uint8_t)0x01   /* latest version number */
 
 /*
  * This is the main portion of the on-disk representation of quota

diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index a3603101e5f00e5517a969d19853ce96c669256d..3e59a348ea71258e7421790803426177c56b3383 100644 (file)
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -546,8 +546,8 @@ xfs_attr_list_int(
 #define        ATTR_ENTBASESIZE                /* minimum bytes used by an attr */ \
        (((struct attrlist_ent *) 0)->a_name - (char *) 0)
 #define        ATTR_ENTSIZE(namelen)           /* actual bytes used by an attr */ \
-       ((ATTR_ENTBASESIZE + (namelen) + 1 + sizeof(u_int32_t)-1) \
-        & ~(sizeof(u_int32_t)-1))
+       ((ATTR_ENTBASESIZE + (namelen) + 1 + sizeof(uint32_t)-1) \
+        & ~(sizeof(uint32_t)-1))
 
 /*
  * Format an attribute and copy it out to the user's buffer.

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 65a7951957c2595fae3ea57cf5444989660cde9c..20dc65fef6a42fa52ad412b9cd5619aa1434245b 100644 (file)
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -311,8 +311,8 @@ xfs_readlink_by_handle(
 int
 xfs_set_dmattrs(
        xfs_inode_t     *ip,
-       u_int           evmask,
-       u_int16_t       state)
+       uint            evmask,
+       uint16_t        state)
 {
        xfs_mount_t     *mp = ip->i_mount;
        xfs_trans_t     *tp;

diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h
index e86c3ea137d2d779113b1d7c3efbd6432aedc25e..8de879f0c7d5e8a63ced7b6d64fdf2fa5834754b 100644 (file)
--- a/fs/xfs/xfs_ioctl.h
+++ b/fs/xfs/xfs_ioctl.h
@@ -86,7 +86,7 @@ xfs_file_compat_ioctl(
 extern int
 xfs_set_dmattrs(
        struct xfs_inode        *ip,
-       u_int                   evmask,
-       u_int16_t               state);
+       uint                    evmask,
+       uint16_t                state);
 
 #endif