Skip to contentSkip to conversation

dlm updates for 5.9

GIT PULL Merged David Teigland 2 participants 2 messages Aug 6, 2020 – Aug 7, 2020

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-5.9

This set includes a some improvements to the dlm networking layer:
improving the ability to trace dlm messages for debugging, and improved handling of bad messages or disrupted connections.

Note two unusual things:
- There is a commit under net that was posted to netdev, which add a socket helper for setting a mark value on a socket.
- This branch was just rebased to drop a commit that was adding a tuning knob to adjust blocking during recovery; we decided there's not enough evidence it's necessary.

Thanks,
Dave

Alexander Aring (6):
net: sock: add sock_set_mark
fs: dlm: set skb mark for listen socket
fs: dlm: set skb mark per peer socket
fs: dlm: don't close socket on invalid message
fs: dlm: change handling of reconnects
fs: dlm: implement tcp graceful shutdown

Wang Hai (1):
dlm: Fix kobject memleak

 fs/dlm/config.c    |  44 +++++++++++++++++++++++++++++
 fs/dlm/config.h    |   2 ++
 fs/dlm/lockspace.c |   6 ++--
 fs/dlm/lowcomms.c  | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 include/net/sock.h |   1 +
 net/core/sock.c    |   8 ++++++
 6 files changed, 164 insertions(+), 28 deletions(-)