diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 15:04:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 15:04:00 -0700 |
commit | df3256f9ab7ae2127144de5ba2abca332278a42d (patch) | |
tree | c2cbdca425b745894a23f8cf7d7c91effcd7478c /include | |
parent | b0ca118dbacbc6c35e15f216e25e95cca7aedf5b (diff) | |
parent | 901025d2f3194b4868980c8ba80df4cc0aa1282c (diff) | |
download | linux-df3256f9ab7ae2127144de5ba2abca332278a42d.tar.bz2 |
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: make plock operation killable
dlm: remove shared message stub for recovery
dlm: delayed reply message warning
dlm: Remove superfluous call to recalc_sigpending()
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/dlm_plock.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/dlm_plock.h b/include/linux/dlm_plock.h index 2dd21243104f..3b1cc1be419f 100644 --- a/include/linux/dlm_plock.h +++ b/include/linux/dlm_plock.h @@ -14,7 +14,7 @@ #define DLM_PLOCK_MISC_NAME "dlm_plock" #define DLM_PLOCK_VERSION_MAJOR 1 -#define DLM_PLOCK_VERSION_MINOR 1 +#define DLM_PLOCK_VERSION_MINOR 2 #define DLM_PLOCK_VERSION_PATCH 0 enum { @@ -23,12 +23,14 @@ enum { DLM_PLOCK_OP_GET, }; +#define DLM_PLOCK_FL_CLOSE 1 + struct dlm_plock_info { __u32 version[3]; __u8 optype; __u8 ex; __u8 wait; - __u8 pad; + __u8 flags; __u32 pid; __s32 nodeid; __s32 rv; |