summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2017-02-28 19:12:03 -0500
committerJ. Bruce Fields <bfields@redhat.com>2017-04-25 17:25:54 -0400
commit16719199a43f0740113041fb34a0854b1d7f2111 (patch)
tree66c33b5dda80ca8e6c603931e2c23c78b3f72834 /include/uapi
parent51f567777799c9d85a778302b9eb61cf15214a98 (diff)
uapi: fix linux/nfsd/cld.h userspace compilation errors
Include <linux/types.h> and consistently use types it provides to fix the following linux/nfsd/cld.h userspace compilation errors: /usr/include/linux/nfsd/cld.h:40:2: error: unknown type name 'uint16_t' uint16_t cn_len; /* length of cm_id */ /usr/include/linux/nfsd/cld.h:46:2: error: unknown type name 'uint8_t' uint8_t cm_vers; /* upcall version */ /usr/include/linux/nfsd/cld.h:47:2: error: unknown type name 'uint8_t' uint8_t cm_cmd; /* upcall command */ /usr/include/linux/nfsd/cld.h:48:2: error: unknown type name 'int16_t' int16_t cm_status; /* return code */ /usr/include/linux/nfsd/cld.h:49:2: error: unknown type name 'uint32_t' uint32_t cm_xid; /* transaction id */ /usr/include/linux/nfsd/cld.h:51:3: error: unknown type name 'int64_t' int64_t cm_gracetime; /* grace period start time */ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/nfsd/cld.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/include/uapi/linux/nfsd/cld.h b/include/uapi/linux/nfsd/cld.h
index f14a9ab06f1f..ec260274be0c 100644
--- a/include/uapi/linux/nfsd/cld.h
+++ b/include/uapi/linux/nfsd/cld.h
@@ -22,6 +22,8 @@
22#ifndef _NFSD_CLD_H 22#ifndef _NFSD_CLD_H
23#define _NFSD_CLD_H 23#define _NFSD_CLD_H
24 24
25#include <linux/types.h>
26
25/* latest upcall version available */ 27/* latest upcall version available */
26#define CLD_UPCALL_VERSION 1 28#define CLD_UPCALL_VERSION 1
27 29
@@ -37,18 +39,18 @@ enum cld_command {
37 39
38/* representation of long-form NFSv4 client ID */ 40/* representation of long-form NFSv4 client ID */
39struct cld_name { 41struct cld_name {
40 uint16_t cn_len; /* length of cm_id */ 42 __u16 cn_len; /* length of cm_id */
41 unsigned char cn_id[NFS4_OPAQUE_LIMIT]; /* client-provided */ 43 unsigned char cn_id[NFS4_OPAQUE_LIMIT]; /* client-provided */
42} __attribute__((packed)); 44} __attribute__((packed));
43 45
44/* message struct for communication with userspace */ 46/* message struct for communication with userspace */
45struct cld_msg { 47struct cld_msg {
46 uint8_t cm_vers; /* upcall version */ 48 __u8 cm_vers; /* upcall version */
47 uint8_t cm_cmd; /* upcall command */ 49 __u8 cm_cmd; /* upcall command */
48 int16_t cm_status; /* return code */ 50 __s16 cm_status; /* return code */
49 uint32_t cm_xid; /* transaction id */ 51 __u32 cm_xid; /* transaction id */
50 union { 52 union {
51 int64_t cm_gracetime; /* grace period start time */ 53 __s64 cm_gracetime; /* grace period start time */
52 struct cld_name cm_name; 54 struct cld_name cm_name;
53 } __attribute__((packed)) cm_u; 55 } __attribute__((packed)) cm_u;
54} __attribute__((packed)); 56} __attribute__((packed));