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>

diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index 188f6e6925a0ed8201bccdfd3d4301ceb56639e9..203a025e30e5a88251d909b263a9b0046dc18d2a 100644 (file)
--- 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 dcfd2499902f62fdea3f0f363a59d5ae7effea70..c6034508fed9a3c1e795f27a8ef188e6452db834 100644 (file)
--- 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
+