summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-04-21 11:35:39 -0500
committerDavid Teigland <teigland@redhat.com>2008-04-21 11:35:39 -0500
commitc1c76743e98346eb052b707f0e054377a09441d1 (patch)
tree375f3378d2b90ac22445fd68843ee10afa253bde
parent3d564fa3472d36cd6aa70514c37b8bbbec5b17ab (diff)
dlm: linux/{dlm,dlm_device}.h: cleanup for userspace
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> Signed-off-by: David Teigland <teigland@redhat.com>
-rw-r--r--include/linux/dlm.h3
-rw-r--r--include/linux/dlm_device.h8
2 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index 188f6e6925a0..203a025e30e5 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>
typedef void dlm_lockspace_t;
@@ -59,7 +60,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 dcfd2499902f..c6034508fed9 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 */
@@ -98,3 +104,5 @@ struct dlm_lock_result {
#define DLM_USER_LSFLG_AUTOFREE 1
#define DLM_USER_LSFLG_FORCEFREE 2
+#endif
+