linux/dlm_device.h uses types from dlm.h and types.h, so pull them in. The
dlm.h header should use __u## rather than uint##_t types and thus pull in
linux/types.h for it.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
include/linux/dlm.h | 3 ++-
include/linux/dlm_device.h | 7 +++++++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index c743fbc..ea301f0 100644
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
@@ -21,6 +21,7 @@
/* Lock levels and flags are here */
#include <linux/dlmconstants.h>
+#include <linux/types.h>
#define DLM_RESNAME_MAXLEN 64
@@ -63,7 +64,7 @@ typedef void dlm_lockspace_t;
struct dlm_lksb {
int sb_status;
- uint32_t sb_lkid;
+ __u32 sb_lkid;
char sb_flags;
char * sb_lvbptr;
};
diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h
index 9642277..9eb2ff4 100644
--- a/include/linux/dlm_device.h
+++ b/include/linux/dlm_device.h
@@ -11,10 +11,16 @@
*******************************************************************************
******************************************************************************/
+#ifndef _LINUX_DLM_DEVICE_H
+#define _LINUX_DLM_DEVICE_H
+
/* This is the device interface for dlm, most users will use a library
* interface.
*/
+#include <linux/dlm.h>
+#include <linux/types.h>
+
#define DLM_USER_LVB_LEN 32
/* Version of the device interface */
@@ -101,3 +107,4 @@ struct dlm_lock_result {
#define DLM_USER_LSFLG_AUTOFREE 1
#define DLM_USER_LSFLG_FORCEFREE 2
+#endif
--
1.5.5
--
