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

Commit a5687787 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

xfs: remove uchar_t/ushort_t/uint_t/ulong_t types 



Just another set of types obsfucating the code, remove them.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
parent 0d87e656

fs/xfs/linux-2.6/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ xfs_parseargs( 
	int			dswidth = 0;

	int			iosize = 0;

	int			dmapi_implies_ikeep = 1;

	uchar_t			iosizelog = 0;

	__uint8_t		iosizelog = 0;



	/*

	 * Copy binary VFS mount flags we are interested in.

fs/xfs/xfs_ag.h

+2 −2
Original line number Diff line number Diff line
@@ -223,8 +223,8 @@ typedef struct xfs_perag 
		be32_to_cpu((a)->agf_levels[XFS_BTNUM_CNTi]), mp))

#define	XFS_MIN_FREELIST_PAG(pag,mp)	\

	(XFS_MIN_FREELIST_RAW(		\

		(uint_t)(pag)->pagf_levels[XFS_BTNUM_BNOi], \

		(uint_t)(pag)->pagf_levels[XFS_BTNUM_CNTi], mp))

		(unsigned int)(pag)->pagf_levels[XFS_BTNUM_BNOi], \

		(unsigned int)(pag)->pagf_levels[XFS_BTNUM_CNTi], mp))



#define XFS_AGB_TO_FSB(mp,agno,agbno)	\

	(((xfs_fsblock_t)(agno) << (mp)->m_sb.sb_agblklog) | (agbno))

fs/xfs/xfs_da_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -1503,7 +1503,7 @@ xfs_da_path_shift(xfs_da_state_t *state, xfs_da_state_path_t *path, 
 * This is implemented with some source-level loop unrolling.

 */

xfs_dahash_t

xfs_da_hashname(const uchar_t *name, int namelen)

xfs_da_hashname(const __uint8_t *name, int namelen)

{

	xfs_dahash_t hash;

fs/xfs/xfs_da_btree.h

+3 −3
Original line number Diff line number Diff line
@@ -91,9 +91,9 @@ enum xfs_dacmp { 
 * Structure to ease passing around component names.

 */

typedef struct xfs_da_args {

	const uchar_t	*name;		/* string (maybe not NULL terminated) */

	const __uint8_t	*name;		/* string (maybe not NULL terminated) */

	int		namelen;	/* length of string (maybe no NULL) */

	uchar_t		*value;		/* set of bytes (maybe contain NULLs) */

	__uint8_t	*value;		/* set of bytes (maybe contain NULLs) */

	int		valuelen;	/* length of value */

	int		flags;		/* argument flags (eg: ATTR_NOCREATE) */

	xfs_dahash_t	hashval;	/* hash value of name */
@@ -251,7 +251,7 @@ xfs_daddr_t xfs_da_reada_buf(struct xfs_trans *trans, struct xfs_inode *dp, 
int	xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno,

					  xfs_dabuf_t *dead_buf);



uint xfs_da_hashname(const uchar_t *name_string, int name_length);

uint xfs_da_hashname(const __uint8_t *name_string, int name_length);

enum xfs_dacmp xfs_da_compname(struct xfs_da_args *args,

				const char *name, int len);

fs/xfs/xfs_log_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ typedef struct xlog_in_core { 
	int			ic_size;

	int			ic_offset;

	int			ic_bwritecnt;

	ushort_t		ic_state;

	unsigned short		ic_state;

	char			*ic_datap;	/* pointer to iclog data */

#ifdef XFS_LOG_TRACE

	struct ktrace		*ic_trace;