[PATCH v4 22/79] cld.h: use __u8, __u16, __s16, __u32 and __s64 from linux/types.h

[Mikko Rapeli]

Fixes userspace compilation errors like:

linux/nfsd/cld.h:40:2: error: unknown type name ‘uint16_t’

Signed-off-by: Mikko Rapeli 
---
 include/uapi/linux/nfsd/cld.h | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/uapi/linux/nfsd/cld.h b/include/uapi/linux/nfsd/cld.h
index f14a9ab..d9f2306 100644
--- a/include/uapi/linux/nfsd/cld.h
+++ b/include/uapi/linux/nfsd/cld.h
@@ -22,6 +22,8 @@
 #ifndef _NFSD_CLD_H
 #define _NFSD_CLD_H
 
+#include 
+
 /* latest upcall version available */
 #define CLD_UPCALL_VERSION 1
 
@@ -37,18 +39,18 @@ enum cld_command {
 
 /* representation of long-form NFSv4 client ID */
 struct cld_name {
-   uint16_tcn_len; /* length of cm_id */
+   __u16   cn_len; /* length of cm_id */
unsigned char   cn_id[NFS4_OPAQUE_LIMIT];   /* client-provided */
 } __attribute__((packed));
 
 /* message struct for communication with userspace */
 struct cld_msg {
-   uint8_t cm_vers;/* upcall version */
-   uint8_t cm_cmd; /* upcall command */
-   int16_t cm_status;  /* return code */
-   uint32_tcm_xid; /* transaction id */
+   __u8cm_vers;/* upcall version */
+   __u8cm_cmd; /* upcall command */
+   __s16   cm_status;  /* return code */
+   __u32   cm_xid; /* transaction id */
union {
-   int64_t cm_gracetime;   /* grace period start time */
+   __s64   cm_gracetime;   /* grace period start time */
struct cld_name cm_name;
} __attribute__((packed)) cm_u;
 } __attribute__((packed));
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v4 22/79] cld.h: use __u8, __u16, __s16, __u32 and __s64 from linux/types.h

[Mikko Rapeli]

Fixes userspace compilation errors like:

linux/nfsd/cld.h:40:2: error: unknown type name ‘uint16_t’

Signed-off-by: Mikko Rapeli 
---
 include/uapi/linux/nfsd/cld.h | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/uapi/linux/nfsd/cld.h b/include/uapi/linux/nfsd/cld.h
index f14a9ab..d9f2306 100644
--- a/include/uapi/linux/nfsd/cld.h
+++ b/include/uapi/linux/nfsd/cld.h
@@ -22,6 +22,8 @@
 #ifndef _NFSD_CLD_H
 #define _NFSD_CLD_H
 
+#include 
+
 /* latest upcall version available */
 #define CLD_UPCALL_VERSION 1
 
@@ -37,18 +39,18 @@ enum cld_command {
 
 /* representation of long-form NFSv4 client ID */
 struct cld_name {
-   uint16_tcn_len; /* length of cm_id */
+   __u16   cn_len; /* length of cm_id */
unsigned char   cn_id[NFS4_OPAQUE_LIMIT];   /* client-provided */
 } __attribute__((packed));
 
 /* message struct for communication with userspace */
 struct cld_msg {
-   uint8_t cm_vers;/* upcall version */
-   uint8_t cm_cmd; /* upcall command */
-   int16_t cm_status;  /* return code */
-   uint32_tcm_xid; /* transaction id */
+   __u8cm_vers;/* upcall version */
+   __u8cm_cmd; /* upcall command */
+   __s16   cm_status;  /* return code */
+   __u32   cm_xid; /* transaction id */
union {
-   int64_t cm_gracetime;   /* grace period start time */
+   __s64   cm_gracetime;   /* grace period start time */
struct cld_name cm_name;
} __attribute__((packed)) cm_u;
 } __attribute__((packed));
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/