Merge tag 'dlm-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

Pull dlm updates from David Teigland:
 "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"

* tag 'dlm-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  fs: dlm: remove filter local comms on close
  fs: dlm: add send ack threshold and append acks to msgs
  fs: dlm: handle sequence numbers as atomic
  fs: dlm: handle lkb wait count as atomic_t
  fs: dlm: filter ourself midcomms calls
  fs: dlm: warn about messages from left nodes
  fs: dlm: move dlm_purge_lkb_callbacks to user module
  fs: dlm: cleanup STOP_IO bitflag set when stop io
  fs: dlm: don't check othercon twice
  fs: dlm: unregister memory at the very last
  fs: dlm: fix missing pending to false
  fs: dlm: clear pending bit when queue was empty
  fs: dlm: revert check required context while close
  fs: dlm: fix mismatch of plock results from userspace
  fs: dlm: make F_SETLK use unkillable wait_event
  fs: dlm: interrupt posix locks only when process is killed
  fs: dlm: fix cleanup pending ops when interrupted
  fs: dlm: return positive pid value for F_GETLK
  dlm: Replace all non-returning strlcpy with strscpy

diff --combined fs/dlm/lowcomms.c
index 5c12d8cdfc16d30028684bbc6fa204b92a91fbc2,68092f953830df5a07384f2239c550bad7730af4..9f14ea9f63224b5de0d623abf4bab128c2289482
--- 1/fs/dlm/lowcomms.c
--- 2/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@@ -546,9 -546,6 +546,6 @@@ int dlm_lowcomms_connect_node(int nodei
        struct connection *con;
        int idx;
  
-       if (nodeid == dlm_our_nodeid())
-               return 0;
- 
        idx = srcu_read_lock(&connections_srcu);
        con = nodeid2con(nodeid, 0);
        if (WARN_ON_ONCE(!con)) {
@@@ -735,19 -732,15 +732,15 @@@ static void stop_connection_io(struct c
        if (con->othercon)
                stop_connection_io(con->othercon);
  
+       spin_lock_bh(&con->writequeue_lock);
+       set_bit(CF_IO_STOP, &con->flags);
+       spin_unlock_bh(&con->writequeue_lock);
+ 
        down_write(&con->sock_lock);
        if (con->sock) {
                lock_sock(con->sock->sk);
                restore_callbacks(con->sock->sk);
- 
-               spin_lock_bh(&con->writequeue_lock);
-               set_bit(CF_IO_STOP, &con->flags);
-               spin_unlock_bh(&con->writequeue_lock);
                release_sock(con->sock->sk);
-       } else {
-               spin_lock_bh(&con->writequeue_lock);
-               set_bit(CF_IO_STOP, &con->flags);
-               spin_unlock_bh(&con->writequeue_lock);
        }
        up_write(&con->sock_lock);
  
@@@ -867,30 -860,8 +860,8 @@@ struct dlm_processed_nodes 
        struct list_head list;
  };
  
- static void add_processed_node(int nodeid, struct list_head *processed_nodes)
- {
-       struct dlm_processed_nodes *n;
- 
-       list_for_each_entry(n, processed_nodes, list) {
-               /* we already remembered this node */
-               if (n->nodeid == nodeid)
-                       return;
-       }
- 
-       /* if it's fails in worst case we simple don't send an ack back.
-        * We try it next time.
-        */
-       n = kmalloc(sizeof(*n), GFP_NOFS);
-       if (!n)
-               return;
- 
-       n->nodeid = nodeid;
-       list_add(&n->list, processed_nodes);
- }
- 
  static void process_dlm_messages(struct work_struct *work)
  {
-       struct dlm_processed_nodes *n, *n_tmp;
        struct processqueue_entry *pentry;
        LIST_HEAD(processed_nodes);
  
@@@ -898,6 -869,7 +869,7 @@@
        pentry = list_first_entry_or_null(&processqueue,
                                          struct processqueue_entry, list);
        if (WARN_ON_ONCE(!pentry)) {
+               process_dlm_messages_pending = false;
                spin_unlock(&processqueue_lock);
                return;
        }
@@@ -908,7 -880,6 +880,6 @@@
        for (;;) {
                dlm_process_incoming_buffer(pentry->nodeid, pentry->buf,
                                            pentry->buflen);
-               add_processed_node(pentry->nodeid, &processed_nodes);
                free_processqueue_entry(pentry);
  
                spin_lock(&processqueue_lock);
@@@ -923,13 -894,6 +894,6 @@@
                list_del(&pentry->list);
                spin_unlock(&processqueue_lock);
        }
- 
-       /* send ack back after we processed couple of messages */
-       list_for_each_entry_safe(n, n_tmp, &processed_nodes, list) {
-               list_del(&n->list);
-               dlm_midcomms_receive_done(n->nodeid);
-               kfree(n);
-       }
  }
  
  /* Data received from remote end */
@@@ -1395,11 -1359,8 +1359,11 @@@ int dlm_lowcomms_resend_msg(struct dlm_
  /* Send a message */
  static int send_to_sock(struct connection *con)
  {
 -      const int msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL;
        struct writequeue_entry *e;
 +      struct bio_vec bvec;
 +      struct msghdr msg = {
 +              .msg_flags = MSG_SPLICE_PAGES | MSG_DONTWAIT | MSG_NOSIGNAL,
 +      };
        int len, offset, ret;
  
        spin_lock_bh(&con->writequeue_lock);
@@@ -1415,9 -1376,8 +1379,9 @@@
        WARN_ON_ONCE(len == 0 && e->users == 0);
        spin_unlock_bh(&con->writequeue_lock);
  
 -      ret = kernel_sendpage(con->sock, e->page, offset, len,
 -                            msg_flags);
 +      bvec_set_page(&bvec, e->page, len, offset);
 +      iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, len);
 +      ret = sock_sendmsg(con->sock, &msg);
        trace_dlm_send(con->nodeid, ret);
        if (ret == -EAGAIN || ret == 0) {
                lock_sock(con->sock->sk);
@@@ -1500,8 -1460,7 +1464,7 @@@ int dlm_lowcomms_close(int nodeid
        call_srcu(&connections_srcu, &con->rcu, connection_release);
        if (con->othercon) {
                clean_one_writequeue(con->othercon);
-               if (con->othercon)
-                       call_srcu(&connections_srcu, &con->othercon->rcu, connection_release);
+               call_srcu(&connections_srcu, &con->othercon->rcu, connection_release);
        }
        srcu_read_unlock(&connections_srcu, idx);