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

Pull dlm fixes from David Teigland:
 "This set fixes error reporting for dlm sockets, removes the unbound
  property on the dlm callback workqueue to improve performance, and
  includes a couple trivial changes"

* tag 'dlm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: fix error return code in sctp_accept_from_sock()
  dlm: don't specify WQ_UNBOUND for the ast callback workqueue
  dlm: remove lock_sock to avoid scheduling while atomic
  dlm: don't save callbacks after accept
  dlm: audit and remove any unnecessary uses of module.h
  dlm: make genl_ops const

9 files changed, 22 insertions, 20 deletions

diff --git a/fs/dlm/ast.c b/fs/dlm/ast.c
index dcea1e37a1b7..07fed838d8fd 100644
--- a/fs/dlm/ast.c
+++ b/fs/dlm/ast.c
@@ -268,7 +268,7 @@ void dlm_callback_work(struct work_struct *work)
 int dlm_callback_start(struct dlm_ls *ls)
 {
         ls->ls_callback_wq = alloc_workqueue("dlm_callback",
-                                             WQ_UNBOUND | WQ_MEM_RECLAIM, 0);
+                                             WQ_HIGHPRI | WQ_MEM_RECLAIM, 0);
         if (!ls->ls_callback_wq) {
                 log_print("can't start dlm_callback workqueue");
                 return -ENOMEM;
diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index df955d2209ce..7211e826d90d 100644
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -12,7 +12,7 @@
 ******************************************************************************/
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/configfs.h>
 #include <linux/slab.h>
 #include <linux/in.h>
diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
index 466f7d60edc2..ca7089aeadab 100644
--- a/fs/dlm/debug_fs.c
+++ b/fs/dlm/debug_fs.c
@@ -12,7 +12,7 @@
 
 #include <linux/pagemap.h>
 #include <linux/seq_file.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/ctype.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index 216b61604ef9..b670f5601fbb 100644
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -18,7 +18,6 @@
  * This is the main header file to be included in each DLM source file.
  */
 
-#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/types.h>
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index f3e72787e7f9..91592b75c309 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -11,6 +11,8 @@
 *******************************************************************************
 ******************************************************************************/
 
+#include <linux/module.h>
+
 #include "dlm_internal.h"
 #include "lockspace.h"
 #include "member.h"
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 609998de533e..7d398d300e97 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -519,29 +519,25 @@ out:
 /* Note: sk_callback_lock must be locked before calling this function. */
 static void save_callbacks(struct connection *con, struct sock *sk)
 {
-        lock_sock(sk);
         con->orig_data_ready = sk->sk_data_ready;
         con->orig_state_change = sk->sk_state_change;
         con->orig_write_space = sk->sk_write_space;
         con->orig_error_report = sk->sk_error_report;
-        release_sock(sk);
 }
 
 static void restore_callbacks(struct connection *con, struct sock *sk)
 {
         write_lock_bh(&sk->sk_callback_lock);
-        lock_sock(sk);
         sk->sk_user_data = NULL;
         sk->sk_data_ready = con->orig_data_ready;
         sk->sk_state_change = con->orig_state_change;
         sk->sk_write_space = con->orig_write_space;
         sk->sk_error_report = con->orig_error_report;
-        release_sock(sk);
         write_unlock_bh(&sk->sk_callback_lock);
 }
 
 /* Make a socket active */
-static void add_sock(struct socket *sock, struct connection *con)
+static void add_sock(struct socket *sock, struct connection *con, bool save_cb)
 {
         struct sock *sk = sock->sk;
 
@@ -549,7 +545,7 @@ static void add_sock(struct socket *sock, struct connection *con)
         con->sock = sock;
 
         sk->sk_user_data = con;
-        if (!test_bit(CF_IS_OTHERCON, &con->flags))
+        if (save_cb)
                 save_callbacks(con, sk);
         /* Install a data_ready callback */
         sk->sk_data_ready = lowcomms_data_ready;
@@ -806,7 +802,7 @@ static int tcp_accept_from_sock(struct connection *con)
                         newcon->othercon = othercon;
                         othercon->sock = newsock;
                         newsock->sk->sk_user_data = othercon;
-                        add_sock(newsock, othercon);
+                        add_sock(newsock, othercon, false);
                         addcon = othercon;
                 }
                 else {
@@ -819,7 +815,10 @@ static int tcp_accept_from_sock(struct connection *con)
         else {
                 newsock->sk->sk_user_data = newcon;
                 newcon->rx_action = receive_from_sock;
-                add_sock(newsock, newcon);
+                /* accept copies the sk after we've saved the callbacks, so we
+                   don't want to save them a second time or comm errors will
+                   result in calling sk_error_report recursively. */
+                add_sock(newsock, newcon, false);
                 addcon = newcon;
         }
 
@@ -880,7 +879,8 @@ static int sctp_accept_from_sock(struct connection *con)
         }
 
         make_sockaddr(&prim.ssp_addr, 0, &addr_len);
-        if (addr_to_nodeid(&prim.ssp_addr, &nodeid)) {
+        ret = addr_to_nodeid(&prim.ssp_addr, &nodeid);
+        if (ret) {
                 unsigned char *b = (unsigned char *)&prim.ssp_addr;
 
                 log_print("reject connect from unknown addr");
@@ -919,7 +919,7 @@ static int sctp_accept_from_sock(struct connection *con)
                         newcon->othercon = othercon;
                         othercon->sock = newsock;
                         newsock->sk->sk_user_data = othercon;
-                        add_sock(newsock, othercon);
+                        add_sock(newsock, othercon, false);
                         addcon = othercon;
                 } else {
                         printk("Extra connection from node %d attempted\n", nodeid);
@@ -930,7 +930,7 @@ static int sctp_accept_from_sock(struct connection *con)
         } else {
                 newsock->sk->sk_user_data = newcon;
                 newcon->rx_action = receive_from_sock;
-                add_sock(newsock, newcon);
+                add_sock(newsock, newcon, false);
                 addcon = newcon;
         }
 
@@ -1058,7 +1058,7 @@ static void sctp_connect_to_sock(struct connection *con)
         sock->sk->sk_user_data = con;
         con->rx_action = receive_from_sock;
         con->connect_action = sctp_connect_to_sock;
-        add_sock(sock, con);
+        add_sock(sock, con, true);
 
         /* Bind to all addresses. */
         if (sctp_bind_addrs(con, 0))
@@ -1146,7 +1146,7 @@ static void tcp_connect_to_sock(struct connection *con)
         sock->sk->sk_user_data = con;
         con->rx_action = receive_from_sock;
         con->connect_action = tcp_connect_to_sock;
-        add_sock(sock, con);
+        add_sock(sock, con, true);
 
         /* Bind to our cluster-known address connecting to avoid
            routing problems */
@@ -1366,7 +1366,7 @@ static int tcp_listen_for_all(void)
 
         sock = tcp_create_listen_sock(con, dlm_local_addr[0]);
         if (sock) {
-                add_sock(sock, con);
+                add_sock(sock, con, true);
                 result = 0;
         }
         else {
diff --git a/fs/dlm/main.c b/fs/dlm/main.c
index 079c0bd71ab7..8e1b618891be 100644
--- a/fs/dlm/main.c
+++ b/fs/dlm/main.c
@@ -11,6 +11,8 @@
 *******************************************************************************
 ******************************************************************************/
 
+#include <linux/module.h>
+
 #include "dlm_internal.h"
 #include "lockspace.h"
 #include "lock.h"
diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c
index 0643ae44f342..43a96c330570 100644
--- a/fs/dlm/netlink.c
+++ b/fs/dlm/netlink.c
@@ -65,7 +65,7 @@ static int user_cmd(struct sk_buff *skb, struct genl_info *info)
         return 0;
 }
 
-static struct genl_ops dlm_nl_ops[] = {
+static const struct genl_ops dlm_nl_ops[] = {
         {
                 .cmd    = DLM_CMD_HELLO,
                 .doit   = user_cmd,
diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 58c2f4a21b7f..1ce908c2232c 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -9,7 +9,6 @@
 #include <linux/miscdevice.h>
 #include <linux/init.h>
 #include <linux/wait.h>
-#include <linux/module.h>
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/poll.h>