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.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.h')
-rw-r--r-- | include/linux/dlm.h | 3 |
1 files changed, 2 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 @@ | |||
21 | 21 | ||
22 | /* Lock levels and flags are here */ | 22 | /* Lock levels and flags are here */ |
23 | #include <linux/dlmconstants.h> | 23 | #include <linux/dlmconstants.h> |
24 | #include <linux/types.h> | ||
24 | 25 | ||
25 | typedef void dlm_lockspace_t; | 26 | typedef void dlm_lockspace_t; |
26 | 27 | ||
@@ -59,7 +60,7 @@ typedef void dlm_lockspace_t; | |||
59 | 60 | ||
60 | struct dlm_lksb { | 61 | struct dlm_lksb { |
61 | int sb_status; | 62 | int sb_status; |
62 | uint32_t sb_lkid; | 63 | __u32 sb_lkid; |
63 | char sb_flags; | 64 | char sb_flags; |
64 | char * sb_lvbptr; | 65 | char * sb_lvbptr; |
65 | }; | 66 | }; |