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_device.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_device.h')
| -rw-r--r-- | include/linux/dlm_device.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h index 9642277a152..c6034508fed 100644 --- 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 */ @@ -94,10 +100,9 @@ struct dlm_lock_result { #define DLM_USER_PURGE 6 #define DLM_USER_DEADLOCK 7 -/* Arbitrary length restriction */ -#define MAX_LS_NAME_LEN 64 - /* Lockspace flags */ #define DLM_USER_LSFLG_AUTOFREE 1 #define DLM_USER_LSFLG_FORCEFREE 2 +#endif + |