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 /fs/gfs2/incore.h | |
| parent | 6133308ad1a386e7e7f776003a1c44e8b54e2166 (diff) | |
| parent | 75af271ed5f51b1f3506c7c1d567b1f32e5c9206 (diff) | |
| download | talos-op-linux-6101167727932a929e37fb8a6eeb68bdbf54d58e.tar.gz talos-op-linux-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 'fs/gfs2/incore.h')
| -rw-r--r-- | fs/gfs2/incore.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index aa9949e5de26..67fd6beffece 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -543,7 +543,6 @@ struct gfs2_sb_host { struct lm_lockstruct { int ls_jid; unsigned int ls_first; - unsigned int ls_nodir; const struct lm_lockops *ls_ops; dlm_lockspace_t *ls_dlm; |
