Skip to contentSkip to conversation

dlm updates for 2.6.29

GIT PULL David Teigland 1 participant 1 message Jan 5, 2009

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull dlm updates for 2.6.29 from:

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

Most have been in linux-next for quite a while. They are minor cleanups, and some additions to debugfs dumps to help with debugging. Thanks,
Dave

Andrew Morton (1):
dlm: fs/dlm/ast.c: fix warning

David Teigland (5):
dlm: remove extra blocking callback check
dlm: improve how bast mode handling
dlm: change lock time stamping
dlm: add time stamp of blocking callback
dlm: add new debugfs entry

Harvey Harrison (1):
dlm: trivial annotation of be16 value

Steven Whitehouse (3):
dlm: fix up memory allocation flags
dlm: remove kmap/kunmap
dlm: replace schedule with cond_resched

 fs/dlm/ast.c          |   56 ++++-----
 fs/dlm/ast.h          |    4 +-
 fs/dlm/debug_fs.c     |  310 ++++++++++++++++++++++++++++++++++++++++---------
 fs/dlm/dir.c          |   18 ++--
 fs/dlm/dlm_internal.h |    4 +-
 fs/dlm/lock.c         |   31 +++---
 fs/dlm/lowcomms.c     |    8 +-
 fs/dlm/memory.c       |    6 +-
 fs/dlm/midcomms.c     |    2 +-
 fs/dlm/netlink.c      |    1 -
 fs/dlm/user.c         |    4 +-
 fs/dlm/user.h         |    2 +-
 12 files changed, 316 insertions(+), 130 deletions(-)