Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65a7935d authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

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: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent ae82968e

fs/xfs/libxfs/xfs_format.h

+1 −1
Original line number Diff line number Diff line
@@ -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

fs/xfs/xfs_attr_list.c

+2 −2
Original line number Diff line number Diff line
@@ -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.

fs/xfs/xfs_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

fs/xfs/xfs_ioctl.h

+2 −2
Original line number Diff line number Diff line
@@ -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