[GIT PULL] dlm updates for 2.6.40

From: David Teigland
Date: Tue May 24 2011 - 15:54:34 EST


Linus,

Please pull dlm updates for 2.6.40 from:

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

The most useful patch makes posix lock operations (from gfs2/ocfs2)
interruptible using the helpful wait_event_killable. This is followed by
a new timer that can be set to warn when locks have been waiting for a
reply message for a configured time. People debugging lost dlm messages
have been asking for this.
Thanks,
Dave

David Teigland (3):
dlm: delayed reply message warning
dlm: remove shared message stub for recovery
dlm: make plock operation killable

Matt Fleming (1):
dlm: Remove superfluous call to recalc_sigpending()

fs/dlm/config.c | 9 ++-
fs/dlm/config.h | 1 +
fs/dlm/dlm_internal.h | 3 +
fs/dlm/lock.c | 182 +++++++++++++++++++++++++++++++++++----------
fs/dlm/lock.h | 1 +
fs/dlm/lockspace.c | 6 +-
fs/dlm/plock.c | 65 +++++++++++++++-
fs/dlm/user.c | 1 -
include/linux/dlm_plock.h | 6 +-
9 files changed, 223 insertions(+), 51 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/