Skip to contentSkip to conversation

dlm updates for 2.6.28

GIT PULL David Teigland 1 participant 1 message Oct 10, 2008

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull dlm updates for 2.6.28 from:

git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git for-linus

They have all been in linux-next for a long time. There are two minor enhancements in addition to the fixes. The first allows a lockspace to be created and used from both kernel and userspace threads at once. This is to support ocfs2 tools using the dlm along with the fs. The second copies an idea from ocfs2. It allows the dlm to detect when the necessary userspace control daemon fails, and to stop locking activity in response.

Thanks,
Dave

Andrew Morton (1):
dlm: choose better identifiers

David Teigland (5):
dlm: allow multiple lockspace creates
dlm: detect available userspace daemon
dlm: fix locking of lockspace list in dlm_scand
dlm: fix address compare
dlm: remove bkl

 fs/dlm/config.c             |   77 ++++++++++++++-------
 fs/dlm/dlm_internal.h       |    7 ++-
 fs/dlm/lockspace.c          |  158 ++++++++++++++++++++++++++++++++-----------
 fs/dlm/lockspace.h          |    1 +
 fs/dlm/user.c               |  124 +++++++++++++++++++++++++--------
 fs/dlm/user.h               |    4 +-
 fs/gfs2/locking/dlm/mount.c |    3 +-
 include/linux/dlm.h         |    5 +-
 include/linux/dlm_device.h  |    2 +-
 9 files changed, 281 insertions(+), 100 deletions(-)