Hi,
These are the dlm patches for the 2.6.40 merge.
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(-)
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()