Skip to contentSkip to conversation

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

PATCH Superseded Roman Storozhenko 2 participants 6 messages Nov 29, 2017 – Dec 5, 2017 Staging

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 staging: lustre: Replace 'uint32_t' with 'u32' and 'uint64_t' with 'u64'

There are two reasons for that:
1) As Linus Torvalds 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'.

---
In the second version of this patch I forgot to add subsystem and driver. As Greg K-H mentioned:
"Please fix up the subject to have the subsystem and driver name in it:
Subject: [PATCH] staging: lustre: ..."

In the first version of this patch I replaced 'uint32_t' with '__u32' and 'uint64_t' with '__u64'. I was suggested to fix that by Greg K-H:

"The __ types are only needed for when you cross the user/kernel boundry. Otherwise just use the "normal" types of u32 and u64.

Do the changes you made here all cross that boundry? If not, please fix this up."

I asked lustre community whether those code used only in the kernel space and Andreas Dilger said:

"These headers are for kernel code only, so should use the "u32" and similar
types, rather than the "__u32" that are used for user-kernel structures."

So I have replaced my first patch version with this one.

 drivers/staging/lustre/lustre/include/lustre_sec.h |  4 ++--
 drivers/staging/lustre/lustre/llite/vvp_dev.c      |  2 +-
 drivers/staging/lustre/lustre/lov/lov_internal.h   | 12 ++++++------
 drivers/staging/lustre/lustre/osc/osc_internal.h   |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/lustre/lustre/include/lustre_sec.h +2 -2
index a40f706..64b6fd4 100644
@@ -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
index 8ccc8b7..987c03b 100644
@@ -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
index ae28ddf..a56d71c 100644
@@ -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
index feda61b..32db150 100644
@@ -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) */
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 1/1 staging: lustre: Replace 'uint32_t' with 'u32' and 'uint64_t' with 'u64'

Quoted 1 line · Roman Storozhenko

There are two reasons for that:

In my email client the subject line and body are not next to each other. It looks like this:

https://marc.info/?l=linux-arm-kernel&m=151187366315885&w=2

So it took me a while to realize what you were talking about. Please assume I'm either reading the subject or the body but not both.

regards,
dan carpenter

#2 lore raw

PATCH v3 1/1 staging: lustre: Replace 'uint32_t' with 'u32' and 'uint64_t' with 'u64'

Quoted 6 lines · Dan Carpenter
Quoted 1 line · Roman Storozhenko

There are two reasons for that:

In my email client the subject line and body are not next to each other. It looks like this:

Quoted 8 lines

https://marc.info/?l=linux-arm-kernel&m=151187366315885&w=2

So it took me a while to realize what you were talking about. Please assume I'm either reading the subject or the body but not both.

regards,
dan carpenter

Hello Dan,

It's really strange. Moreover the screenshot that you have provided doesn't relate to my patch. Anyway I checked the source file of the message (I use 'mutt -H <source_file>) and found that body goes below the subject with one empty separate line (according to patch format recomendations).
Could you check is your message related to my patch?
If so, please provide the screenshot of my patch.

Thanks in advance,
Roman Storozhenko

#3 lore raw

PATCH v3 1/1 staging: lustre: Replace 'uint32_t' with 'u32' and 'uint64_t' with 'u64'

Quoted 15 lines · Roman Storozhenko
Quoted 6 lines · Dan Carpenter
Quoted 1 line · Roman Storozhenko

There are two reasons for that:

In my email client the subject line and body are not next to each other. It looks like this:

Quoted 8 lines

https://marc.info/?l=linux-arm-kernel&m=151187366315885&w=2

So it took me a while to realize what you were talking about. Please assume I'm either reading the subject or the body but not both.

regards,
dan carpenter

Quoted 7 lines

Hello Dan,

It's really strange. Moreover the screenshot that you have provided doesn't relate to my patch. Anyway I checked the source file of the message (I use 'mutt -H <source_file>) and found that body goes below the subject with one empty separate line (according to patch format recomendations).

Mutt is very configurable. Mine looks like the marc.info link. The patch was chosen at random to show how the subject and body are not next to each other.

regards,
dan carpenter

#4 lore raw

PATCH v3 1/1 staging: lustre: Replace 'uint32_t' with 'u32' and 'uint64_t' with 'u64'

In reply to Roman Storozhenko
Quoted 1 line · Roman Storozhenko

There are two reasons for that:

What I'm asking is there are two reasons for what? Where is the first part of that paragraph?

regards,
dan carpenter

#5 lore raw

PATCH v3 1/1 staging: lustre: Replace 'uint32_t' with 'u32' and 'uint64_t' with 'u64'

Quoted 5 lines · Dan Carpenter
Quoted 1 line · Roman Storozhenko

There are two reasons for that:

What I'm asking is there are two reasons for what? Where is the first part of that paragraph?

Hello, Dan!

Now I understand what did you mean. I shouldn't have written reason in the subject line and reference to it as 'that' in the body.

Thanks for you mentioned that. In the following patches I will avoid such types of mistakes.

Regards,
Romans Storozhenko

Quoted 4 lines

regards,
dan carpenter