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

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

xfs: remove double-underscore integer types 



This is a purely mechanical patch that removes the private
__{u,}int{8,16,32,64}_t typedefs in favor of using the system
{u,}int{8,16,32,64}_t typedefs.  This is the sed script used to perform
the transformation and fix the resulting whitespace and indentation
errors:

s/typedef\t__uint8_t/typedef __uint8_t\t/g
s/typedef\t__uint/typedef __uint/g
s/typedef\t__int\([0-9]*\)_t/typedef int\1_t\t/g
s/__uint8_t\t/__uint8_t\t\t/g
s/__uint/uint/g
s/__int\([0-9]*\)_t\t/__int\1_t\t\t/g
s/__int/int/g
/^typedef.*int[0-9]*_t;$/d

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 5a4c7334

fs/xfs/libxfs/xfs_alloc_btree.c

+10 −10
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ xfs_allocbt_init_ptr_from_cur( 
	ptr->s = agf->agf_roots[cur->bc_btnum];

}



STATIC __int64_t

STATIC int64_t

xfs_bnobt_key_diff(

	struct xfs_btree_cur	*cur,

	union xfs_btree_key	*key)
@@ -261,42 +261,42 @@ xfs_bnobt_key_diff( 
	xfs_alloc_rec_incore_t	*rec = &cur->bc_rec.a;

	xfs_alloc_key_t		*kp = &key->alloc;



	return (__int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock;

	return (int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock;

}



STATIC __int64_t

STATIC int64_t

xfs_cntbt_key_diff(

	struct xfs_btree_cur	*cur,

	union xfs_btree_key	*key)

{

	xfs_alloc_rec_incore_t	*rec = &cur->bc_rec.a;

	xfs_alloc_key_t		*kp = &key->alloc;

	__int64_t		diff;

	int64_t			diff;



	diff = (__int64_t)be32_to_cpu(kp->ar_blockcount) - rec->ar_blockcount;

	diff = (int64_t)be32_to_cpu(kp->ar_blockcount) - rec->ar_blockcount;

	if (diff)

		return diff;



	return (__int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock;

	return (int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock;

}



STATIC __int64_t

STATIC int64_t

xfs_bnobt_diff_two_keys(

	struct xfs_btree_cur	*cur,

	union xfs_btree_key	*k1,

	union xfs_btree_key	*k2)

{

	return (__int64_t)be32_to_cpu(k1->alloc.ar_startblock) -

	return (int64_t)be32_to_cpu(k1->alloc.ar_startblock) -

			  be32_to_cpu(k2->alloc.ar_startblock);

}



STATIC __int64_t

STATIC int64_t

xfs_cntbt_diff_two_keys(

	struct xfs_btree_cur	*cur,

	union xfs_btree_key	*k1,

	union xfs_btree_key	*k2)

{

	__int64_t		diff;

	int64_t			diff;



	diff =  be32_to_cpu(k1->alloc.ar_blockcount) -

		be32_to_cpu(k2->alloc.ar_blockcount);

fs/xfs/libxfs/xfs_attr_remote.c

+4 −4
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ xfs_attr_rmtval_copyout( 
	xfs_ino_t	ino,

	int		*offset,

	int		*valuelen,

	__uint8_t	**dst)

	uint8_t		**dst)

{

	char		*src = bp->b_addr;

	xfs_daddr_t	bno = bp->b_bn;
@@ -301,7 +301,7 @@ xfs_attr_rmtval_copyin( 
	xfs_ino_t	ino,

	int		*offset,

	int		*valuelen,

	__uint8_t	**src)

	uint8_t		**src)

{

	char		*dst = bp->b_addr;

	xfs_daddr_t	bno = bp->b_bn;
@@ -355,7 +355,7 @@ xfs_attr_rmtval_get( 
	struct xfs_mount	*mp = args->dp->i_mount;

	struct xfs_buf		*bp;

	xfs_dablk_t		lblkno = args->rmtblkno;

	__uint8_t		*dst = args->value;

	uint8_t			*dst = args->value;

	int			valuelen;

	int			nmap;

	int			error;
@@ -421,7 +421,7 @@ xfs_attr_rmtval_set( 
	struct xfs_bmbt_irec	map;

	xfs_dablk_t		lblkno;

	xfs_fileoff_t		lfileoff = 0;

	__uint8_t		*src = args->value;

	uint8_t			*src = args->value;

	int			blkcnt;

	int			valuelen;

	int			nmap;

fs/xfs/libxfs/xfs_attr_sf.h

+5 −5
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ typedef struct xfs_attr_sf_entry xfs_attr_sf_entry_t; 
 * We generate this then sort it, attr_list() must return things in hash-order.

 */

typedef struct xfs_attr_sf_sort {

	__uint8_t	entno;		/* entry number in original list */

	__uint8_t	namelen;	/* length of name value (no null) */

	__uint8_t	valuelen;	/* length of value */

	__uint8_t	flags;		/* flags bits (see xfs_attr_leaf.h) */

	uint8_t		entno;		/* entry number in original list */

	uint8_t		namelen;	/* length of name value (no null) */

	uint8_t		valuelen;	/* length of value */

	uint8_t		flags;		/* flags bits (see xfs_attr_leaf.h) */

	xfs_dahash_t	hash;		/* this entry's hash value */

	unsigned char	*name;		/* name value, pointer into buffer */

} xfs_attr_sf_sort_t;
@@ -42,7 +42,7 @@ typedef struct xfs_attr_sf_sort { 
#define XFS_ATTR_SF_ENTSIZE_BYNAME(nlen,vlen)	/* space name/value uses */ \

	(((int)sizeof(xfs_attr_sf_entry_t)-1 + (nlen)+(vlen)))

#define XFS_ATTR_SF_ENTSIZE_MAX			/* max space for name&value */ \

	((1 << (NBBY*(int)sizeof(__uint8_t))) - 1)

	((1 << (NBBY*(int)sizeof(uint8_t))) - 1)

#define XFS_ATTR_SF_ENTSIZE(sfep)		/* space an entry uses */ \

	((int)sizeof(xfs_attr_sf_entry_t)-1 + (sfep)->namelen+(sfep)->valuelen)

#define XFS_ATTR_SF_NEXTENTRY(sfep)		/* next entry in struct */ \

fs/xfs/libxfs/xfs_bit.h

+12 −12
Original line number Diff line number Diff line
@@ -25,47 +25,47 @@ 
/*

 * masks with n high/low bits set, 64-bit values

 */

static inline __uint64_t xfs_mask64hi(int n)

static inline uint64_t xfs_mask64hi(int n)

{

	return (__uint64_t)-1 << (64 - (n));

	return (uint64_t)-1 << (64 - (n));

}

static inline __uint32_t xfs_mask32lo(int n)

static inline uint32_t xfs_mask32lo(int n)

{

	return ((__uint32_t)1 << (n)) - 1;

	return ((uint32_t)1 << (n)) - 1;

}

static inline __uint64_t xfs_mask64lo(int n)

static inline uint64_t xfs_mask64lo(int n)

{

	return ((__uint64_t)1 << (n)) - 1;

	return ((uint64_t)1 << (n)) - 1;

}



/* Get high bit set out of 32-bit argument, -1 if none set */

static inline int xfs_highbit32(__uint32_t v)

static inline int xfs_highbit32(uint32_t v)

{

	return fls(v) - 1;

}



/* Get high bit set out of 64-bit argument, -1 if none set */

static inline int xfs_highbit64(__uint64_t v)

static inline int xfs_highbit64(uint64_t v)

{

	return fls64(v) - 1;

}



/* Get low bit set out of 32-bit argument, -1 if none set */

static inline int xfs_lowbit32(__uint32_t v)

static inline int xfs_lowbit32(uint32_t v)

{

	return ffs(v) - 1;

}



/* Get low bit set out of 64-bit argument, -1 if none set */

static inline int xfs_lowbit64(__uint64_t v)

static inline int xfs_lowbit64(uint64_t v)

{

	__uint32_t	w = (__uint32_t)v;

	uint32_t	w = (uint32_t)v;

	int		n = 0;



	if (w) {	/* lower bits */

		n = ffs(w);

	} else {	/* upper bits */

		w = (__uint32_t)(v >> 32);

		w = (uint32_t)(v >> 32);

		if (w) {

			n = ffs(w);

			if (n)

fs/xfs/libxfs/xfs_bmap_btree.c

+4 −4
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ xfs_bmdr_to_bmbt( 
 */

STATIC void

__xfs_bmbt_get_all(

		__uint64_t l0,

		__uint64_t l1,

		uint64_t l0,

		uint64_t l1,

		xfs_bmbt_irec_t *s)

{

	int	ext_flag;
@@ -588,12 +588,12 @@ xfs_bmbt_init_ptr_from_cur( 
	ptr->l = 0;

}



STATIC __int64_t

STATIC int64_t

xfs_bmbt_key_diff(

	struct xfs_btree_cur	*cur,

	union xfs_btree_key	*key)

{

	return (__int64_t)be64_to_cpu(key->bmbt.br_startoff) -

	return (int64_t)be64_to_cpu(key->bmbt.br_startoff) -

				      cur->bc_rec.b.br_startoff;

}