diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-04-21 12:35:39 -0400 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2008-04-21 12:35:39 -0400 |
commit | c1c76743e98346eb052b707f0e054377a09441d1 (patch) | |
tree | 375f3378d2b90ac22445fd68843ee10afa253bde /include/linux/dlm_device.h | |
parent | 3d564fa3472d36cd6aa70514c37b8bbbec5b17ab (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>
Diffstat (limited to 'include/linux/dlm_device.h')
-rw-r--r-- | include/linux/dlm_device.h | 8 |
1 files changed, 8 insertions, 0 deletions
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 @@ | |||
11 | ******************************************************************************* | 11 | ******************************************************************************* |
12 | ******************************************************************************/ | 12 | ******************************************************************************/ |
13 | 13 | ||
14 | #ifndef _LINUX_DLM_DEVICE_H | ||
15 | #define _LINUX_DLM_DEVICE_H | ||
16 | |||
14 | /* This is the device interface for dlm, most users will use a library | 17 | /* This is the device interface for dlm, most users will use a library |
15 | * interface. | 18 | * interface. |
16 | */ | 19 | */ |
17 | 20 | ||
21 | #include <linux/dlm.h> | ||
22 | #include <linux/types.h> | ||
23 | |||
18 | #define DLM_USER_LVB_LEN 32 | 24 | #define DLM_USER_LVB_LEN 32 |
19 | 25 | ||
20 | /* Version of the device interface */ | 26 | /* Version of the device interface */ |
@@ -98,3 +104,5 @@ struct dlm_lock_result { | |||
98 | #define DLM_USER_LSFLG_AUTOFREE 1 | 104 | #define DLM_USER_LSFLG_AUTOFREE 1 |
99 | #define DLM_USER_LSFLG_FORCEFREE 2 | 105 | #define DLM_USER_LSFLG_FORCEFREE 2 |
100 | 106 | ||
107 | #endif | ||
108 | |||