Skip to contentSkip to conversation

dlm updates for 3.7

GIT PULL David Teigland 1 participant 1 message Oct 1, 2012

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull dlm updates from tag:

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

There are two main patches in this set, both related to the userland dlm_controld daemon. The first fixes a deadlock between dlm_controld and the dlm_send workqueue when both access configfs data simultaneously. The second reworks some code to get around a long standing, but intentional, unlock balance warning. The userland daemon no longer takes a lock that is later released from the kernel. The other commits are minor fixes and changes.

Thanks,
Dave

David Teigland (3):
dlm: fix deadlock between dlm_send and dlm_controld
dlm: fix uninitialized spinlock
dlm: fix unlock balance warnings

Sasha Levin (1):
dlm: check the maximum size of a request from user

Xue Ying (1):
dlm: remove redundant variable assignments

Ying Xue (2):
dlm: convert add_sock routine return value type to void
dlm: cleanup send_to_sock routine

 fs/dlm/ast.c          |    4 +-
 fs/dlm/config.c       |   79 ++++--------------
 fs/dlm/config.h       |    2 -
 fs/dlm/dlm_internal.h |   46 ++++++++---
 fs/dlm/lockspace.c    |   15 +++-
 fs/dlm/lowcomms.c     |  215 +++++++++++++++++++++++++++++++++++++++++--------
 fs/dlm/lowcomms.h     |    2 +
 fs/dlm/main.c         |    2 +
 fs/dlm/member.c       |   17 ++--
 fs/dlm/rcom.c         |    2 +-
 fs/dlm/recoverd.c     |   27 ++++---
 fs/dlm/recoverd.h     |    1 -
 fs/dlm/user.c         |    7 ++
 13 files changed, 289 insertions(+), 130 deletions(-)