Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: <linux/dlm_plock.h> should be "unifdef"ed.
  dlm: fix plock dev_write return value
  dlm: tcp_connect_to_sock should check for -EINVAL, not EINVAL
  dlm: section mismatch warning fix
  dlm: convert connections_lock in a mutex

4 files changed, 17 insertions, 16 deletions

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 7c1e5e5cccd8..637018c891ef 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -50,6 +50,7 @@
 #include <linux/pagemap.h>
 #include <linux/idr.h>
 #include <linux/file.h>
+#include <linux/mutex.h>
 #include <linux/sctp.h>
 #include <net/sctp/user.h>
 
@@ -138,7 +139,7 @@ static struct workqueue_struct *recv_workqueue;
 static struct workqueue_struct *send_workqueue;
 
 static DEFINE_IDR(connections_idr);
-static DECLARE_MUTEX(connections_lock);
+static DEFINE_MUTEX(connections_lock);
 static int max_nodeid;
 static struct kmem_cache *con_cache;
 
@@ -205,9 +206,9 @@ static struct connection *nodeid2con(int nodeid, gfp_t allocation)
 {
         struct connection *con;
 
-        down(&connections_lock);
+        mutex_lock(&connections_lock);
         con = __nodeid2con(nodeid, allocation);
-        up(&connections_lock);
+        mutex_unlock(&connections_lock);
 
         return con;
 }
@@ -218,15 +219,15 @@ static struct connection *assoc2con(int assoc_id)
         int i;
         struct connection *con;
 
-        down(&connections_lock);
+        mutex_lock(&connections_lock);
         for (i=0; i<=max_nodeid; i++) {
                 con = __nodeid2con(i, 0);
                 if (con && con->sctp_assoc == assoc_id) {
-                        up(&connections_lock);
+                        mutex_unlock(&connections_lock);
                         return con;
                 }
         }
-        up(&connections_lock);
+        mutex_unlock(&connections_lock);
         return NULL;
 }
 
@@ -381,7 +382,7 @@ static void sctp_init_failed(void)
         int i;
         struct connection *con;
 
-        down(&connections_lock);
+        mutex_lock(&connections_lock);
         for (i=1; i<=max_nodeid; i++) {
                 con = __nodeid2con(i, 0);
                 if (!con)
@@ -393,7 +394,7 @@ static void sctp_init_failed(void)
                         }
                 }
         }
-        up(&connections_lock);
+        mutex_unlock(&connections_lock);
 }
 
 /* Something happened to an association */
@@ -930,7 +931,7 @@ out_err:
          * errors we try again until the max number of retries is reached.
          */
         if (result != -EHOSTUNREACH && result != -ENETUNREACH &&
-            result != -ENETDOWN && result != EINVAL
+            result != -ENETDOWN && result != -EINVAL
             && result != -EPROTONOSUPPORT) {
                 lowcomms_connect_sock(con);
                 result = 0;
@@ -1417,7 +1418,7 @@ void dlm_lowcomms_stop(void)
         /* Set all the flags to prevent any
            socket activity.
         */
-        down(&connections_lock);
+        mutex_lock(&connections_lock);
         for (i = 0; i <= max_nodeid; i++) {
                 con = __nodeid2con(i, 0);
                 if (con) {
@@ -1426,11 +1427,11 @@ void dlm_lowcomms_stop(void)
                                 con->sock->sk->sk_user_data = NULL;
                 }
         }
-        up(&connections_lock);
+        mutex_unlock(&connections_lock);
 
         work_stop();
 
-        down(&connections_lock);
+        mutex_lock(&connections_lock);
         clean_writequeues();
 
         for (i = 0; i <= max_nodeid; i++) {
@@ -1443,7 +1444,7 @@ void dlm_lowcomms_stop(void)
                 }
         }
         max_nodeid = 0;
-        up(&connections_lock);
+        mutex_unlock(&connections_lock);
         kmem_cache_destroy(con_cache);
         idr_init(&connections_idr);
 }
diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c
index 714593621f4f..18bda83cc892 100644
--- a/fs/dlm/netlink.c
+++ b/fs/dlm/netlink.c
@@ -95,7 +95,7 @@ int __init dlm_netlink_init(void)
         return rv;
 }
 
-void __exit dlm_netlink_exit(void)
+void dlm_netlink_exit(void)
 {
         genl_unregister_ops(&family, &dlm_nl_ops);
         genl_unregister_family(&family);
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index d6d6e370f89c..78878c5781ca 100644
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -379,7 +379,7 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count,
                 struct plock_xop *xop;
                 xop = (struct plock_xop *)op;
                 if (xop->callback)
-                        count = dlm_plock_callback(op);
+                        dlm_plock_callback(op);
                 else
                         wake_up(&recv_wq);
         } else
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index b7d81b2a9041..5dfa739045c8 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -105,7 +105,6 @@ header-y += ixjuser.h
 header-y += jffs2.h
 header-y += keyctl.h
 header-y += limits.h
-header-y += dlm_plock.h
 header-y += magic.h
 header-y += major.h
 header-y += matroxfb.h
@@ -190,6 +189,7 @@ unifdef-y += cyclades.h
 unifdef-y += dccp.h
 unifdef-y += dirent.h
 unifdef-y += dlm.h
+unifdef-y += dlm_plock.h
 unifdef-y += edd.h
 unifdef-y += elf.h
 unifdef-y += elfcore.h