diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 13:44:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 13:44:23 -0700 |
commit | 03b883840c630c7b571690577809754739ac773f (patch) | |
tree | aeec0581accf5e19360205e21dd25a220b4a0e54 /include/linux/dlm.h | |
parent | 0d07a15bdb5a4ea6271b6e874d307c48151ef546 (diff) | |
parent | c1c76743e98346eb052b707f0e054377a09441d1 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: linux/{dlm,dlm_device}.h: cleanup for userspace
dlm: common max length definitions
dlm: move plock code from gfs2
dlm: recover nodes that are removed and re-added
dlm: save master info after failed no-queue request
dlm: make dlm_print_rsb() static
dlm: match signedness between dlm_config_info and cluster_set
Diffstat (limited to 'include/linux/dlm.h')
-rw-r--r-- | include/linux/dlm.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/dlm.h b/include/linux/dlm.h index c743fbc769d..203a025e30e 100644 --- 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; }; |