提交 16719199 编写于 作者: D Dmitry V. Levin 提交者: J. Bruce Fields

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: NDmitry V. Levin <ldv@altlinux.org>
Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
上级 51f56777
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#ifndef _NFSD_CLD_H #ifndef _NFSD_CLD_H
#define _NFSD_CLD_H #define _NFSD_CLD_H
#include <linux/types.h>
/* latest upcall version available */ /* latest upcall version available */
#define CLD_UPCALL_VERSION 1 #define CLD_UPCALL_VERSION 1
...@@ -37,18 +39,18 @@ enum cld_command { ...@@ -37,18 +39,18 @@ enum cld_command {
/* representation of long-form NFSv4 client ID */ /* representation of long-form NFSv4 client ID */
struct cld_name { struct cld_name {
uint16_t cn_len; /* length of cm_id */ __u16 cn_len; /* length of cm_id */
unsigned char cn_id[NFS4_OPAQUE_LIMIT]; /* client-provided */ unsigned char cn_id[NFS4_OPAQUE_LIMIT]; /* client-provided */
} __attribute__((packed)); } __attribute__((packed));
/* message struct for communication with userspace */ /* message struct for communication with userspace */
struct cld_msg { struct cld_msg {
uint8_t cm_vers; /* upcall version */ __u8 cm_vers; /* upcall version */
uint8_t cm_cmd; /* upcall command */ __u8 cm_cmd; /* upcall command */
int16_t cm_status; /* return code */ __s16 cm_status; /* return code */
uint32_t cm_xid; /* transaction id */ __u32 cm_xid; /* transaction id */
union { union {
int64_t cm_gracetime; /* grace period start time */ __s64 cm_gracetime; /* grace period start time */
struct cld_name cm_name; struct cld_name cm_name;
} __attribute__((packed)) cm_u; } __attribute__((packed)) cm_u;
} __attribute__((packed)); } __attribute__((packed));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册