Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[pandora-kernel.git] / include / linux / dlm.h

diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index c743fbc..203a025 100644 (file)
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
@@ -21,10 +21,7 @@
 
 /* Lock levels and flags are here */
 #include <linux/dlmconstants.h>
-
-
-#define DLM_RESNAME_MAXLEN     64
-
+#include <linux/types.h>
 
 typedef void dlm_lockspace_t;
 
@@ -63,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;
 };