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

Commit a1b475af authored by Roman Storozhenko's avatar Roman Storozhenko Committed by Greg Kroah-Hartman
Browse files

staging: lustre: Replace 'uint32_t' with 'u32' and 'uint64_t' with 'u64' 

There are two reasons for replacing 'uint32_t' with 'u32'
and 'uint64_t' with 'u64':

1) As Linus Torvalds have said we should use kernel types:
http://lkml.iu.edu/hypermail//linux/kernel/1506.0/00160.html



2) There are only few places in the lustre codebase that use such types.
In the most cases it uses 'u32' and 'u64'.

Signed-off-by: default avatarRoman Storozhenko <romeusmeister@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37edc1cc

drivers/staging/lustre/lustre/include/lustre_sec.h

+2 −2
Original line number Diff line number Diff line
@@ -341,8 +341,8 @@ void sptlrpc_conf_client_adapt(struct obd_device *obd); 
#define SPTLRPC_MAX_PAYLOAD     (1024)



struct vfs_cred {

	uint32_t	vc_uid;

	uint32_t	vc_gid;

	u32	vc_uid;

	u32	vc_gid;

};



struct ptlrpc_ctx_ops {

drivers/staging/lustre/lustre/llite/vvp_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ int cl_sb_fini(struct super_block *sb) 
struct vvp_pgcache_id {

	unsigned int		 vpi_bucket;

	unsigned int		 vpi_depth;

	uint32_t		 vpi_index;

	u32			 vpi_index;



	unsigned int		 vpi_curdep;

	struct lu_object_header *vpi_obj;

drivers/staging/lustre/lustre/lov/lov_internal.h

+6 −6
Original line number Diff line number Diff line
@@ -115,19 +115,19 @@ static inline const struct lsm_operations *lsm_op_find(int magic) 
 */

#if BITS_PER_LONG == 64

# define lov_do_div64(n, base) ({					\

	uint64_t __base = (base);					\

	uint64_t __rem;							\

	__rem = ((uint64_t)(n)) % __base;				\

	(n) = ((uint64_t)(n)) / __base;					\

	u64 __base = (base);					\

	u64 __rem;							\

	__rem = ((u64)(n)) % __base;				\

	(n) = ((u64)(n)) / __base;					\

	__rem;								\

})

#elif BITS_PER_LONG == 32

# define lov_do_div64(n, base) ({					\

	uint64_t __rem;							\

	u64 __rem;							\

	if ((sizeof(base) > 4) && (((base) & 0xffffffff00000000ULL) != 0)) {  \

		int __remainder;					      \

		LASSERTF(!((base) & (LOV_MIN_STRIPE_SIZE - 1)), "64 bit lov " \

			 "division %llu / %llu\n", (n), (uint64_t)(base));    \

			 "division %llu / %llu\n", (n), (u64)(base));    \

		__remainder = (n) & (LOV_MIN_STRIPE_SIZE - 1);		\

		(n) >>= LOV_MIN_STRIPE_BITS;				\

		__rem = do_div(n, (base) >> LOV_MIN_STRIPE_BITS);	\

drivers/staging/lustre/lustre/osc/osc_internal.h

+3 −3
Original line number Diff line number Diff line
@@ -168,9 +168,9 @@ struct osc_device { 


	/* Write stats is actually protected by client_obd's lock. */

	struct osc_stats {

		uint64_t     os_lockless_writes;	  /* by bytes */

		uint64_t     os_lockless_reads;	   /* by bytes */

		uint64_t     os_lockless_truncates;       /* by times */

		u64	os_lockless_writes;	  /* by bytes */

		u64	os_lockless_reads;	  /* by bytes */

		u64	os_lockless_truncates;    /* by times */

	} od_stats;



	/* configuration item(s) */