diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 19:31:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 19:31:38 -0700 |
| commit | 6101167727932a929e37fb8a6eeb68bdbf54d58e (patch) | |
| tree | da3e9c8244f86082c6ea4d150f7fa653a7843192 /include | |
| parent | Merge tag 'upstream-3.5-rc1' of git://git.infradead.org/linux-ubifs (diff) | |
| parent | dlm: NULL dereference on failure in kmem_cache_create() (diff) | |
| download | linux-dev-6101167727932a929e37fb8a6eeb68bdbf54d58e.tar.xz linux-dev-6101167727932a929e37fb8a6eeb68bdbf54d58e.zip | |
Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates from David Teigland:
"This set includes some minor fixes and improvements. The one large
patch addresses the special "nodir" mode, which has been a long
neglected proof of concept, but with these fixes seems to be quite
usable. It allows the resource master to be assigned statically
instead of dynamically, which can improve performance if there is
little locality and most resources are shared."
* tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: NULL dereference on failure in kmem_cache_create()
gfs2: fix recovery during unmount
dlm: fixes for nodir mode
dlm: improve error and debug messages
dlm: avoid unnecessary search in search_rsb
dlm: limit rcom debug messages
dlm: fix waiter recovery
dlm: prevent connections during shutdown
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dlm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/dlm.h b/include/linux/dlm.h index 6c7f6e9546c7..520152411cd1 100644 --- a/include/linux/dlm.h +++ b/include/linux/dlm.h @@ -67,7 +67,6 @@ struct dlm_lksb { /* dlm_new_lockspace() flags */ -#define DLM_LSFL_NODIR 0x00000001 #define DLM_LSFL_TIMEWARN 0x00000002 #define DLM_LSFL_FS 0x00000004 #define DLM_LSFL_NEWEXCL 0x00000008 |