Hi Linus,

Please pull dlm updates from tag:

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

The dlm posix lock handling (for gfs2) has three notable changes:

- Local pids returned from GETLK are no longer negated.  A previous
  patch negating remote pids mistakenly changed local pids also.

- SETLKW operations can now be interrupted only when the process is
  killed, and not from other signals.  General interruption was
  resulting in previously acquired locks being cleared, not just
  the in-progress lock.  Handling this correctly will require
  extending a cancel capability to user space (a future feature.)

- If multiple threads are requesting posix locks (with SETLKW),
  fix incorrect matching of results to the requests.

The dlm networking has several minor cleanups, and one notable change:

- Avoid delaying ack messages for too long (used for message reliability),
  resulting in a backlog of un-acked messages.  These could previously
  be delayed as a result of either too many or too few other messages
  being sent.  Now an upper and lower threshold is used to determine
  when an ack should be sent.

Thanks,
Dave


Alexander Aring (18):
      fs: dlm: return positive pid value for F_GETLK
      fs: dlm: fix cleanup pending ops when interrupted
      fs: dlm: interrupt posix locks only when process is killed
      fs: dlm: make F_SETLK use unkillable wait_event
      fs: dlm: fix mismatch of plock results from userspace
      fs: dlm: revert check required context while close
      fs: dlm: clear pending bit when queue was empty
      fs: dlm: fix missing pending to false
      fs: dlm: unregister memory at the very last
      fs: dlm: don't check othercon twice
      fs: dlm: cleanup STOP_IO bitflag set when stop io
      fs: dlm: move dlm_purge_lkb_callbacks to user module
      fs: dlm: warn about messages from left nodes
      fs: dlm: filter ourself midcomms calls
      fs: dlm: handle lkb wait count as atomic_t
      fs: dlm: handle sequence numbers as atomic
      fs: dlm: add send ack threshold and append acks to msgs
      fs: dlm: remove filter local comms on close

Azeem Shaikh (1):
      dlm: Replace all non-returning strlcpy with strscpy


 fs/dlm/ast.c          |  25 ++--------
 fs/dlm/ast.h          |   1 -
 fs/dlm/config.c       |   4 +-
 fs/dlm/dlm_internal.h |   2 +-
 fs/dlm/lock.c         |  36 +++++++--------
 fs/dlm/lockspace.c    |  12 -----
 fs/dlm/lockspace.h    |   1 -
 fs/dlm/lowcomms.c     |  49 +++-----------------
 fs/dlm/main.c         |   2 +-
 fs/dlm/member.c       |  37 ++++++++++++---
 fs/dlm/midcomms.c     | 126 ++++++++++++++++++++++----------------------------
 fs/dlm/plock.c        | 115 +++++++++++++++++++++++++++------------------
 fs/dlm/user.c         |  18 ++++++++
 fs/dlm/user.h         |   1 +
 14 files changed, 205 insertions(+), 224 deletions(-)

Reply via email to