kset: convert kernel_subsys to use kset_create
[safe/jmp/linux-2.6] / fs / dlm / lowcomms.c
index 6da6b14..e9923ca 100644 (file)
@@ -2,7 +2,7 @@
 *******************************************************************************
 **
 **  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+**  Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.
 **
 **  This copyrighted material is made available to anyone wishing to use,
 **  modify, copy, or redistribute it subject to the terms and conditions
  * of high load. Also, this way, the sending thread can collect together
  * messages bound for one node and send them in one block.
  *
- * I don't see any problem with the recv thread executing the locking
- * code on behalf of remote processes as the locking code is
- * short, efficient and never (well, hardly ever) waits.
+ * lowcomms will choose to use wither TCP or SCTP as its transport layer
+ * depending on the configuration variable 'protocol'. This should be set
+ * to 0 (default) for TCP or 1 for SCTP. It shouldbe configured using a
+ * cluster-wide mechanism as it must be the same on all nodes of the cluster
+ * for the DLM to function.
  *
  */
 
 #include <asm/ioctls.h>
 #include <net/sock.h>
 #include <net/tcp.h>
-#include <net/sctp/user.h>
 #include <linux/pagemap.h>
-#include <linux/socket.h>
 #include <linux/idr.h>
+#include <linux/file.h>
+#include <linux/sctp.h>
+#include <net/sctp/user.h>
 
 #include "dlm_internal.h"
 #include "lowcomms.h"
-#include "config.h"
 #include "midcomms.h"
+#include "config.h"
 
-static struct sockaddr_storage *dlm_local_addr[DLM_MAX_ADDR_COUNT];
-static int                     dlm_local_count;
-static int                     dlm_local_nodeid;
-
-/* One of these per connected node */
-
-#define NI_INIT_PENDING 1
-#define NI_WRITE_PENDING 2
-
-struct nodeinfo {
-       spinlock_t              lock;
-       sctp_assoc_t            assoc_id;
-       unsigned long           flags;
-       struct list_head        write_list; /* nodes with pending writes */
-       struct list_head        writequeue; /* outgoing writequeue_entries */
-       spinlock_t              writequeue_lock;
-       int                     nodeid;
-};
-
-static DEFINE_IDR(nodeinfo_idr);
-static struct rw_semaphore     nodeinfo_lock;
-static int                     max_nodeid;
+#define NEEDED_RMEM (4*1024*1024)
 
 struct cbuf {
-       unsigned                base;
-       unsigned                len;
-       unsigned                mask;
+       unsigned int base;
+       unsigned int len;
+       unsigned int mask;
 };
 
-/* Just the one of these, now. But this struct keeps
-   the connection-specific variables together */
+static void cbuf_add(struct cbuf *cb, int n)
+{
+       cb->len += n;
+}
 
-#define CF_READ_PENDING 1
+static int cbuf_data(struct cbuf *cb)
+{
+       return ((cb->base + cb->len) & cb->mask);
+}
+
+static void cbuf_init(struct cbuf *cb, int size)
+{
+       cb->base = cb->len = 0;
+       cb->mask = size-1;
+}
+
+static void cbuf_eat(struct cbuf *cb, int n)
+{
+       cb->len  -= n;
+       cb->base += n;
+       cb->base &= cb->mask;
+}
+
+static bool cbuf_empty(struct cbuf *cb)
+{
+       return cb->len == 0;
+}
 
 struct connection {
-       struct socket          *sock;
-       unsigned long           flags;
-       struct page            *rx_page;
-       atomic_t                waiting_requests;
-       struct cbuf             cb;
-       int                     eagain_flag;
+       struct socket *sock;    /* NULL if not connected */
+       uint32_t nodeid;        /* So we know who we are in the list */
+       struct mutex sock_mutex;
+       unsigned long flags;
+#define CF_READ_PENDING 1
+#define CF_WRITE_PENDING 2
+#define CF_CONNECT_PENDING 3
+#define CF_INIT_PENDING 4
+#define CF_IS_OTHERCON 5
+       struct list_head writequeue;  /* List of outgoing writequeue_entries */
+       spinlock_t writequeue_lock;
+       int (*rx_action) (struct connection *); /* What to do when active */
+       void (*connect_action) (struct connection *);   /* What to do to connect */
+       struct page *rx_page;
+       struct cbuf cb;
+       int retries;
+#define MAX_CONNECT_RETRIES 3
+       int sctp_assoc;
+       struct connection *othercon;
+       struct work_struct rwork; /* Receive workqueue */
+       struct work_struct swork; /* Send workqueue */
 };
+#define sock2con(x) ((struct connection *)(x)->sk_user_data)
 
 /* An entry waiting to be sent */
-
 struct writequeue_entry {
-       struct list_head        list;
-       struct page            *page;
-       int                     offset;
-       int                     len;
-       int                     end;
-       int                     users;
-       struct nodeinfo        *ni;
+       struct list_head list;
+       struct page *page;
+       int offset;
+       int len;
+       int end;
+       int users;
+       struct connection *con;
 };
 
-#define CBUF_ADD(cb, n) do { (cb)->len += n; } while(0)
-#define CBUF_EMPTY(cb) ((cb)->len == 0)
-#define CBUF_MAY_ADD(cb, n) (((cb)->len + (n)) < ((cb)->mask + 1))
-#define CBUF_DATA(cb) (((cb)->base + (cb)->len) & (cb)->mask)
-
-#define CBUF_INIT(cb, size) \
-do { \
-       (cb)->base = (cb)->len = 0; \
-       (cb)->mask = ((size)-1); \
-} while(0)
+static struct sockaddr_storage *dlm_local_addr[DLM_MAX_ADDR_COUNT];
+static int dlm_local_count;
 
-#define CBUF_EAT(cb, n) \
-do { \
-       (cb)->len  -= (n); \
-       (cb)->base += (n); \
-       (cb)->base &= (cb)->mask; \
-} while(0)
+/* Work queues */
+static struct workqueue_struct *recv_workqueue;
+static struct workqueue_struct *send_workqueue;
 
+static DEFINE_IDR(connections_idr);
+static DECLARE_MUTEX(connections_lock);
+static int max_nodeid;
+static struct kmem_cache *con_cache;
 
-/* List of nodes which have writes pending */
-static struct list_head write_nodes;
-static spinlock_t write_nodes_lock;
+static void process_recv_sockets(struct work_struct *work);
+static void process_send_sockets(struct work_struct *work);
 
-/* Maximum number of incoming messages to process before
- * doing a schedule()
+/*
+ * If 'allocation' is zero then we don't attempt to create a new
+ * connection structure for this node.
  */
-#define MAX_RX_MSG_COUNT 25
+static struct connection *__nodeid2con(int nodeid, gfp_t alloc)
+{
+       struct connection *con = NULL;
+       int r;
+       int n;
+
+       con = idr_find(&connections_idr, nodeid);
+       if (con || !alloc)
+               return con;
+
+       r = idr_pre_get(&connections_idr, alloc);
+       if (!r)
+               return NULL;
+
+       con = kmem_cache_zalloc(con_cache, alloc);
+       if (!con)
+               return NULL;
+
+       r = idr_get_new_above(&connections_idr, con, nodeid, &n);
+       if (r) {
+               kmem_cache_free(con_cache, con);
+               return NULL;
+       }
+
+       if (n != nodeid) {
+               idr_remove(&connections_idr, n);
+               kmem_cache_free(con_cache, con);
+               return NULL;
+       }
+
+       con->nodeid = nodeid;
+       mutex_init(&con->sock_mutex);
+       INIT_LIST_HEAD(&con->writequeue);
+       spin_lock_init(&con->writequeue_lock);
+       INIT_WORK(&con->swork, process_send_sockets);
+       INIT_WORK(&con->rwork, process_recv_sockets);
 
-/* Manage daemons */
-static struct task_struct *recv_task;
-static struct task_struct *send_task;
-static wait_queue_head_t lowcomms_recv_wait;
-static atomic_t accepting;
+       /* Setup action pointers for child sockets */
+       if (con->nodeid) {
+               struct connection *zerocon = idr_find(&connections_idr, 0);
 
-/* The SCTP connection */
-static struct connection sctp_con;
+               con->connect_action = zerocon->connect_action;
+               if (!con->rx_action)
+                       con->rx_action = zerocon->rx_action;
+       }
+
+       if (nodeid > max_nodeid)
+               max_nodeid = nodeid;
+
+       return con;
+}
+
+static struct connection *nodeid2con(int nodeid, gfp_t allocation)
+{
+       struct connection *con;
+
+       down(&connections_lock);
+       con = __nodeid2con(nodeid, allocation);
+       up(&connections_lock);
 
+       return con;
+}
+
+/* This is a bit drastic, but only called when things go wrong */
+static struct connection *assoc2con(int assoc_id)
+{
+       int i;
+       struct connection *con;
+
+       down(&connections_lock);
+       for (i=0; i<=max_nodeid; i++) {
+               con = __nodeid2con(i, 0);
+               if (con && con->sctp_assoc == assoc_id) {
+                       up(&connections_lock);
+                       return con;
+               }
+       }
+       up(&connections_lock);
+       return NULL;
+}
 
 static int nodeid_to_addr(int nodeid, struct sockaddr *retaddr)
 {
@@ -161,11 +243,11 @@ static int nodeid_to_addr(int nodeid, struct sockaddr *retaddr)
                return error;
 
        if (dlm_local_addr[0]->ss_family == AF_INET) {
-               struct sockaddr_in *in4  = (struct sockaddr_in *) &addr;
+               struct sockaddr_in *in4  = (struct sockaddr_in *) &addr;
                struct sockaddr_in *ret4 = (struct sockaddr_in *) retaddr;
                ret4->sin_addr.s_addr = in4->sin_addr.s_addr;
        } else {
-               struct sockaddr_in6 *in6  = (struct sockaddr_in6 *) &addr;
+               struct sockaddr_in6 *in6  = (struct sockaddr_in6 *) &addr;
                struct sockaddr_in6 *ret6 = (struct sockaddr_in6 *) retaddr;
                memcpy(&ret6->sin6_addr, &in6->sin6_addr,
                       sizeof(in6->sin6_addr));
@@ -174,144 +256,100 @@ static int nodeid_to_addr(int nodeid, struct sockaddr *retaddr)
        return 0;
 }
 
-static struct nodeinfo *nodeid2nodeinfo(int nodeid, gfp_t alloc)
+/* Data available on socket or listen socket received a connect */
+static void lowcomms_data_ready(struct sock *sk, int count_unused)
 {
-       struct nodeinfo *ni;
-       int r;
-       int n;
-
-       down_read(&nodeinfo_lock);
-       ni = idr_find(&nodeinfo_idr, nodeid);
-       up_read(&nodeinfo_lock);
-
-       if (!ni && alloc) {
-               down_write(&nodeinfo_lock);
-
-               ni = idr_find(&nodeinfo_idr, nodeid);
-               if (ni)
-                       goto out_up;
-
-               r = idr_pre_get(&nodeinfo_idr, alloc);
-               if (!r)
-                       goto out_up;
-
-               ni = kmalloc(sizeof(struct nodeinfo), alloc);
-               if (!ni)
-                       goto out_up;
-
-               r = idr_get_new_above(&nodeinfo_idr, ni, nodeid, &n);
-               if (r) {
-                       kfree(ni);
-                       ni = NULL;
-                       goto out_up;
-               }
-               if (n != nodeid) {
-                       idr_remove(&nodeinfo_idr, n);
-                       kfree(ni);
-                       ni = NULL;
-                       goto out_up;
-               }
-               memset(ni, 0, sizeof(struct nodeinfo));
-               spin_lock_init(&ni->lock);
-               INIT_LIST_HEAD(&ni->writequeue);
-               spin_lock_init(&ni->writequeue_lock);
-               ni->nodeid = nodeid;
-
-               if (nodeid > max_nodeid)
-                       max_nodeid = nodeid;
-       out_up:
-               up_write(&nodeinfo_lock);
-       }
-
-       return ni;
+       struct connection *con = sock2con(sk);
+       if (con && !test_and_set_bit(CF_READ_PENDING, &con->flags))
+               queue_work(recv_workqueue, &con->rwork);
 }
 
-/* Don't call this too often... */
-static struct nodeinfo *assoc2nodeinfo(sctp_assoc_t assoc)
+static void lowcomms_write_space(struct sock *sk)
 {
-       int i;
-       struct nodeinfo *ni;
+       struct connection *con = sock2con(sk);
 
-       for (i=1; i<=max_nodeid; i++) {
-               ni = nodeid2nodeinfo(i, 0);
-               if (ni && ni->assoc_id == assoc)
-                       return ni;
-       }
-       return NULL;
+       if (con && !test_and_set_bit(CF_WRITE_PENDING, &con->flags))
+               queue_work(send_workqueue, &con->swork);
 }
 
-/* Data or notification available on socket */
-static void lowcomms_data_ready(struct sock *sk, int count_unused)
+static inline void lowcomms_connect_sock(struct connection *con)
 {
-       atomic_inc(&sctp_con.waiting_requests);
-       if (test_and_set_bit(CF_READ_PENDING, &sctp_con.flags))
-               return;
+       if (!test_and_set_bit(CF_CONNECT_PENDING, &con->flags))
+               queue_work(send_workqueue, &con->swork);
+}
 
-       wake_up_interruptible(&lowcomms_recv_wait);
+static void lowcomms_state_change(struct sock *sk)
+{
+       if (sk->sk_state == TCP_ESTABLISHED)
+               lowcomms_write_space(sk);
 }
 
+/* Make a socket active */
+static int add_sock(struct socket *sock, struct connection *con)
+{
+       con->sock = sock;
 
-/* Add the port number to an IP6 or 4 sockaddr and return the address length.
-   Also padd out the struct with zeros to make comparisons meaningful */
+       /* Install a data_ready callback */
+       con->sock->sk->sk_data_ready = lowcomms_data_ready;
+       con->sock->sk->sk_write_space = lowcomms_write_space;
+       con->sock->sk->sk_state_change = lowcomms_state_change;
+       con->sock->sk->sk_user_data = con;
+       return 0;
+}
 
+/* Add the port number to an IPv6 or 4 sockaddr and return the address
+   length */
 static void make_sockaddr(struct sockaddr_storage *saddr, uint16_t port,
                          int *addr_len)
 {
-       struct sockaddr_in *local4_addr;
-       struct sockaddr_in6 *local6_addr;
-
-       if (!dlm_local_count)
-               return;
-
-       if (!port) {
-               if (dlm_local_addr[0]->ss_family == AF_INET) {
-                       local4_addr = (struct sockaddr_in *)dlm_local_addr[0];
-                       port = be16_to_cpu(local4_addr->sin_port);
-               } else {
-                       local6_addr = (struct sockaddr_in6 *)dlm_local_addr[0];
-                       port = be16_to_cpu(local6_addr->sin6_port);
-               }
-       }
-
-       saddr->ss_family = dlm_local_addr[0]->ss_family;
-       if (dlm_local_addr[0]->ss_family == AF_INET) {
+       saddr->ss_family =  dlm_local_addr[0]->ss_family;
+       if (saddr->ss_family == AF_INET) {
                struct sockaddr_in *in4_addr = (struct sockaddr_in *)saddr;
                in4_addr->sin_port = cpu_to_be16(port);
-               memset(&in4_addr->sin_zero, 0, sizeof(in4_addr->sin_zero));
-               memset(in4_addr+1, 0, sizeof(struct sockaddr_storage) -
-                                     sizeof(struct sockaddr_in));
                *addr_len = sizeof(struct sockaddr_in);
+               memset(&in4_addr->sin_zero, 0, sizeof(in4_addr->sin_zero));
        } else {
                struct sockaddr_in6 *in6_addr = (struct sockaddr_in6 *)saddr;
                in6_addr->sin6_port = cpu_to_be16(port);
-               memset(in6_addr+1, 0, sizeof(struct sockaddr_storage) -
-                                     sizeof(struct sockaddr_in6));
                *addr_len = sizeof(struct sockaddr_in6);
        }
+       memset((char *)saddr + *addr_len, 0, sizeof(struct sockaddr_storage) - *addr_len);
 }
 
-/* Close the connection and tidy up */
-static void close_connection(void)
+/* Close a remote connection and tidy up */
+static void close_connection(struct connection *con, bool and_other)
 {
-       if (sctp_con.sock) {
-               sock_release(sctp_con.sock);
-               sctp_con.sock = NULL;
-       }
+       mutex_lock(&con->sock_mutex);
 
-       if (sctp_con.rx_page) {
-               __free_page(sctp_con.rx_page);
-               sctp_con.rx_page = NULL;
+       if (con->sock) {
+               sock_release(con->sock);
+               con->sock = NULL;
+       }
+       if (con->othercon && and_other) {
+               /* Will only re-enter once. */
+               close_connection(con->othercon, false);
        }
+       if (con->rx_page) {
+               __free_page(con->rx_page);
+               con->rx_page = NULL;
+       }
+
+       con->retries = 0;
+       mutex_unlock(&con->sock_mutex);
 }
 
 /* We only send shutdown messages to nodes that are not part of the cluster */
-static void send_shutdown(sctp_assoc_t associd)
+static void sctp_send_shutdown(sctp_assoc_t associd)
 {
        static char outcmsg[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
        struct msghdr outmessage;
        struct cmsghdr *cmsg;
        struct sctp_sndrcvinfo *sinfo;
        int ret;
+       struct connection *con;
+
+       con = nodeid2con(0,0);
+       BUG_ON(con == NULL);
 
        outmessage.msg_name = NULL;
        outmessage.msg_namelen = 0;
@@ -324,45 +362,43 @@ static void send_shutdown(sctp_assoc_t associd)
        cmsg->cmsg_type = SCTP_SNDRCV;
        cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
        outmessage.msg_controllen = cmsg->cmsg_len;
-       sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
+       sinfo = CMSG_DATA(cmsg);
        memset(sinfo, 0x00, sizeof(struct sctp_sndrcvinfo));
 
        sinfo->sinfo_flags |= MSG_EOF;
        sinfo->sinfo_assoc_id = associd;
 
-       ret = kernel_sendmsg(sctp_con.sock, &outmessage, NULL, 0, 0);
+       ret = kernel_sendmsg(con->sock, &outmessage, NULL, 0, 0);
 
        if (ret != 0)
                log_print("send EOF to node failed: %d", ret);
 }
 
-
 /* INIT failed but we don't know which node...
    restart INIT on all pending nodes */
-static void init_failed(void)
+static void sctp_init_failed(void)
 {
        int i;
-       struct nodeinfo *ni;
+       struct connection *con;
 
+       down(&connections_lock);
        for (i=1; i<=max_nodeid; i++) {
-               ni = nodeid2nodeinfo(i, 0);
-               if (!ni)
+               con = __nodeid2con(i, 0);
+               if (!con)
                        continue;
-
-               if (test_and_clear_bit(NI_INIT_PENDING, &ni->flags)) {
-                       ni->assoc_id = 0;
-                       if (!test_and_set_bit(NI_WRITE_PENDING, &ni->flags)) {
-                               spin_lock_bh(&write_nodes_lock);
-                               list_add_tail(&ni->write_list, &write_nodes);
-                               spin_unlock_bh(&write_nodes_lock);
+               con->sctp_assoc = 0;
+               if (test_and_clear_bit(CF_CONNECT_PENDING, &con->flags)) {
+                       if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags)) {
+                               queue_work(send_workqueue, &con->swork);
                        }
                }
        }
-       wake_up_process(send_task);
+       up(&connections_lock);
 }
 
 /* Something happened to an association */
-static void process_sctp_notification(struct msghdr *msg, char *buf)
+static void process_sctp_notification(struct connection *con,
+                                     struct msghdr *msg, char *buf)
 {
        union sctp_notification *sn = (union sctp_notification *)buf;
 
@@ -374,86 +410,98 @@ static void process_sctp_notification(struct msghdr *msg, char *buf)
                {
                        /* Check that the new node is in the lockspace */
                        struct sctp_prim prim;
-                       mm_segment_t fs;
                        int nodeid;
                        int prim_len, ret;
                        int addr_len;
-                       struct nodeinfo *ni;
-
-                       /* This seems to happen when we received a connection
-                        * too early... or something...  anyway, it happens but
-                        * we always seem to get a real message too, see
-                        * receive_from_sock */
-
+                       struct connection *new_con;
+                       struct file *file;
+                       sctp_peeloff_arg_t parg;
+                       int parglen = sizeof(parg);
+
+                       /*
+                        * We get this before any data for an association.
+                        * We verify that the node is in the cluster and
+                        * then peel off a socket for it.
+                        */
                        if ((int)sn->sn_assoc_change.sac_assoc_id <= 0) {
                                log_print("COMM_UP for invalid assoc ID %d",
                                         (int)sn->sn_assoc_change.sac_assoc_id);
-                               init_failed();
+                               sctp_init_failed();
                                return;
                        }
                        memset(&prim, 0, sizeof(struct sctp_prim));
                        prim_len = sizeof(struct sctp_prim);
                        prim.ssp_assoc_id = sn->sn_assoc_change.sac_assoc_id;
 
-                       fs = get_fs();
-                       set_fs(get_ds());
-                       ret = sctp_con.sock->ops->getsockopt(sctp_con.sock,
-                                               IPPROTO_SCTP, SCTP_PRIMARY_ADDR,
-                                               (char*)&prim, &prim_len);
-                       set_fs(fs);
+                       ret = kernel_getsockopt(con->sock,
+                                               IPPROTO_SCTP,
+                                               SCTP_PRIMARY_ADDR,
+                                               (char*)&prim,
+                                               &prim_len);
                        if (ret < 0) {
-                               struct nodeinfo *ni;
-
                                log_print("getsockopt/sctp_primary_addr on "
                                          "new assoc %d failed : %d",
-                                   (int)sn->sn_assoc_change.sac_assoc_id, ret);
+                                         (int)sn->sn_assoc_change.sac_assoc_id,
+                                         ret);
 
                                /* Retry INIT later */
-                               ni = assoc2nodeinfo(sn->sn_assoc_change.sac_assoc_id);
-                               if (ni)
-                                       clear_bit(NI_INIT_PENDING, &ni->flags);
+                               new_con = assoc2con(sn->sn_assoc_change.sac_assoc_id);
+                               if (new_con)
+                                       clear_bit(CF_CONNECT_PENDING, &con->flags);
                                return;
                        }
                        make_sockaddr(&prim.ssp_addr, 0, &addr_len);
                        if (dlm_addr_to_nodeid(&prim.ssp_addr, &nodeid)) {
+                               int i;
+                               unsigned char *b=(unsigned char *)&prim.ssp_addr;
                                log_print("reject connect from unknown addr");
-                               send_shutdown(prim.ssp_assoc_id);
+                               for (i=0; i<sizeof(struct sockaddr_storage);i++)
+                                       printk("%02x ", b[i]);
+                               printk("\n");
+                               sctp_send_shutdown(prim.ssp_assoc_id);
                                return;
                        }
 
-                       ni = nodeid2nodeinfo(nodeid, GFP_KERNEL);
-                       if (!ni)
+                       new_con = nodeid2con(nodeid, GFP_KERNEL);
+                       if (!new_con)
                                return;
 
-                       /* Save the assoc ID */
-                       spin_lock(&ni->lock);
-                       ni->assoc_id = sn->sn_assoc_change.sac_assoc_id;
-                       spin_unlock(&ni->lock);
+                       /* Peel off a new sock */
+                       parg.associd = sn->sn_assoc_change.sac_assoc_id;
+                       ret = kernel_getsockopt(con->sock, IPPROTO_SCTP,
+                                               SCTP_SOCKOPT_PEELOFF,
+                                               (void *)&parg, &parglen);
+                       if (ret) {
+                               log_print("Can't peel off a socket for "
+                                         "connection %d to node %d: err=%d\n",
+                                         parg.associd, nodeid, ret);
+                       }
+                       file = fget(parg.sd);
+                       new_con->sock = SOCKET_I(file->f_dentry->d_inode);
+                       add_sock(new_con->sock, new_con);
+                       fput(file);
+                       put_unused_fd(parg.sd);
 
                        log_print("got new/restarted association %d nodeid %d",
-                              (int)sn->sn_assoc_change.sac_assoc_id, nodeid);
+                                (int)sn->sn_assoc_change.sac_assoc_id, nodeid);
 
                        /* Send any pending writes */
-                       clear_bit(NI_INIT_PENDING, &ni->flags);
-                       if (!test_and_set_bit(NI_WRITE_PENDING, &ni->flags)) {
-                               spin_lock_bh(&write_nodes_lock);
-                               list_add_tail(&ni->write_list, &write_nodes);
-                               spin_unlock_bh(&write_nodes_lock);
+                       clear_bit(CF_CONNECT_PENDING, &new_con->flags);
+                       clear_bit(CF_INIT_PENDING, &con->flags);
+                       if (!test_and_set_bit(CF_WRITE_PENDING, &new_con->flags)) {
+                               queue_work(send_workqueue, &new_con->swork);
                        }
-                       wake_up_process(send_task);
+                       if (!test_and_set_bit(CF_READ_PENDING, &new_con->flags))
+                               queue_work(recv_workqueue, &new_con->rwork);
                }
                break;
 
                case SCTP_COMM_LOST:
                case SCTP_SHUTDOWN_COMP:
                {
-                       struct nodeinfo *ni;
-
-                       ni = assoc2nodeinfo(sn->sn_assoc_change.sac_assoc_id);
-                       if (ni) {
-                               spin_lock(&ni->lock);
-                               ni->assoc_id = 0;
-                               spin_unlock(&ni->lock);
+                       con = assoc2con(sn->sn_assoc_change.sac_assoc_id);
+                       if (con) {
+                               con->sctp_assoc = 0;
                        }
                }
                break;
@@ -465,7 +513,7 @@ static void process_sctp_notification(struct msghdr *msg, char *buf)
                case SCTP_CANT_STR_ASSOC:
                {
                        log_print("Can't start SCTP association - retrying");
-                       init_failed();
+                       sctp_init_failed();
                }
                break;
 
@@ -478,167 +526,476 @@ static void process_sctp_notification(struct msghdr *msg, char *buf)
 }
 
 /* Data received from remote end */
-static int receive_from_sock(void)
+static int receive_from_sock(struct connection *con)
 {
        int ret = 0;
-       struct msghdr msg;
+       struct msghdr msg = {};
        struct kvec iov[2];
        unsigned len;
        int r;
-       struct sctp_sndrcvinfo *sinfo;
-       struct cmsghdr *cmsg;
-       struct nodeinfo *ni;
+       int call_again_soon = 0;
+       int nvec;
+       char incmsg[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
 
-       /* These two are marginally too big for stack allocation, but this
-        * function is (currently) only called by dlm_recvd so static should be
-        * OK.
-        */
-       static struct sockaddr_storage msgname;
-       static char incmsg[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
+       mutex_lock(&con->sock_mutex);
 
-       if (sctp_con.sock == NULL)
-               goto out;
+       if (con->sock == NULL) {
+               ret = -EAGAIN;
+               goto out_close;
+       }
 
-       if (sctp_con.rx_page == NULL) {
+       if (con->rx_page == NULL) {
                /*
                 * This doesn't need to be atomic, but I think it should
                 * improve performance if it is.
                 */
-               sctp_con.rx_page = alloc_page(GFP_ATOMIC);
-               if (sctp_con.rx_page == NULL)
+               con->rx_page = alloc_page(GFP_ATOMIC);
+               if (con->rx_page == NULL)
                        goto out_resched;
-               CBUF_INIT(&sctp_con.cb, PAGE_CACHE_SIZE);
+               cbuf_init(&con->cb, PAGE_CACHE_SIZE);
        }
 
+       /* Only SCTP needs these really */
        memset(&incmsg, 0, sizeof(incmsg));
-       memset(&msgname, 0, sizeof(msgname));
-
-       memset(incmsg, 0, sizeof(incmsg));
-       msg.msg_name = &msgname;
-       msg.msg_namelen = sizeof(msgname);
-       msg.msg_flags = 0;
        msg.msg_control = incmsg;
        msg.msg_controllen = sizeof(incmsg);
-       msg.msg_iovlen = 1;
-
-       /* I don't see why this circular buffer stuff is necessary for SCTP
-        * which is a packet-based protocol, but the whole thing breaks under
-        * load without it! The overhead is minimal (and is in the TCP lowcomms
-        * anyway, of course) so I'll leave it in until I can figure out what's
-        * really happening.
-        */
 
        /*
         * iov[0] is the bit of the circular buffer between the current end
         * point (cb.base + cb.len) and the end of the buffer.
         */
-       iov[0].iov_len = sctp_con.cb.base - CBUF_DATA(&sctp_con.cb);
-       iov[0].iov_base = page_address(sctp_con.rx_page) +
-                         CBUF_DATA(&sctp_con.cb);
+       iov[0].iov_len = con->cb.base - cbuf_data(&con->cb);
+       iov[0].iov_base = page_address(con->rx_page) + cbuf_data(&con->cb);
        iov[1].iov_len = 0;
+       nvec = 1;
 
        /*
         * iov[1] is the bit of the circular buffer between the start of the
         * buffer and the start of the currently used section (cb.base)
         */
-       if (CBUF_DATA(&sctp_con.cb) >= sctp_con.cb.base) {
-               iov[0].iov_len = PAGE_CACHE_SIZE - CBUF_DATA(&sctp_con.cb);
-               iov[1].iov_len = sctp_con.cb.base;
-               iov[1].iov_base = page_address(sctp_con.rx_page);
-               msg.msg_iovlen = 2;
+       if (cbuf_data(&con->cb) >= con->cb.base) {
+               iov[0].iov_len = PAGE_CACHE_SIZE - cbuf_data(&con->cb);
+               iov[1].iov_len = con->cb.base;
+               iov[1].iov_base = page_address(con->rx_page);
+               nvec = 2;
        }
        len = iov[0].iov_len + iov[1].iov_len;
 
-       r = ret = kernel_recvmsg(sctp_con.sock, &msg, iov, msg.msg_iovlen, len,
-                                MSG_NOSIGNAL | MSG_DONTWAIT);
+       r = ret = kernel_recvmsg(con->sock, &msg, iov, nvec, len,
+                              MSG_DONTWAIT | MSG_NOSIGNAL);
        if (ret <= 0)
                goto out_close;
 
-       msg.msg_control = incmsg;
-       msg.msg_controllen = sizeof(incmsg);
-       cmsg = CMSG_FIRSTHDR(&msg);
-       sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
-
+       /* Process SCTP notifications */
        if (msg.msg_flags & MSG_NOTIFICATION) {
-               process_sctp_notification(&msg, page_address(sctp_con.rx_page));
+               msg.msg_control = incmsg;
+               msg.msg_controllen = sizeof(incmsg);
+
+               process_sctp_notification(con, &msg,
+                               page_address(con->rx_page) + con->cb.base);
+               mutex_unlock(&con->sock_mutex);
                return 0;
        }
+       BUG_ON(con->nodeid == 0);
+
+       if (ret == len)
+               call_again_soon = 1;
+       cbuf_add(&con->cb, ret);
+       ret = dlm_process_incoming_buffer(con->nodeid,
+                                         page_address(con->rx_page),
+                                         con->cb.base, con->cb.len,
+                                         PAGE_CACHE_SIZE);
+       if (ret == -EBADMSG) {
+               log_print("lowcomms: addr=%p, base=%u, len=%u, "
+                         "iov_len=%u, iov_base[0]=%p, read=%d",
+                         page_address(con->rx_page), con->cb.base, con->cb.len,
+                         len, iov[0].iov_base, r);
+       }
+       if (ret < 0)
+               goto out_close;
+       cbuf_eat(&con->cb, ret);
+
+       if (cbuf_empty(&con->cb) && !call_again_soon) {
+               __free_page(con->rx_page);
+               con->rx_page = NULL;
+       }
+
+       if (call_again_soon)
+               goto out_resched;
+       mutex_unlock(&con->sock_mutex);
+       return 0;
+
+out_resched:
+       if (!test_and_set_bit(CF_READ_PENDING, &con->flags))
+               queue_work(recv_workqueue, &con->rwork);
+       mutex_unlock(&con->sock_mutex);
+       return -EAGAIN;
+
+out_close:
+       mutex_unlock(&con->sock_mutex);
+       if (ret != -EAGAIN) {
+               close_connection(con, false);
+               /* Reconnect when there is something to send */
+       }
+       /* Don't return success if we really got EOF */
+       if (ret == 0)
+               ret = -EAGAIN;
+
+       return ret;
+}
+
+/* Listening socket is busy, accept a connection */
+static int tcp_accept_from_sock(struct connection *con)
+{
+       int result;
+       struct sockaddr_storage peeraddr;
+       struct socket *newsock;
+       int len;
+       int nodeid;
+       struct connection *newcon;
+       struct connection *addcon;
+
+       memset(&peeraddr, 0, sizeof(peeraddr));
+       result = sock_create_kern(dlm_local_addr[0]->ss_family, SOCK_STREAM,
+                                 IPPROTO_TCP, &newsock);
+       if (result < 0)
+               return -ENOMEM;
+
+       mutex_lock_nested(&con->sock_mutex, 0);
+
+       result = -ENOTCONN;
+       if (con->sock == NULL)
+               goto accept_err;
+
+       newsock->type = con->sock->type;
+       newsock->ops = con->sock->ops;
+
+       result = con->sock->ops->accept(con->sock, newsock, O_NONBLOCK);
+       if (result < 0)
+               goto accept_err;
+
+       /* Get the connected socket's peer */
+       memset(&peeraddr, 0, sizeof(peeraddr));
+       if (newsock->ops->getname(newsock, (struct sockaddr *)&peeraddr,
+                                 &len, 2)) {
+               result = -ECONNABORTED;
+               goto accept_err;
+       }
+
+       /* Get the new node's NODEID */
+       make_sockaddr(&peeraddr, 0, &len);
+       if (dlm_addr_to_nodeid(&peeraddr, &nodeid)) {
+               log_print("connect from non cluster node");
+               sock_release(newsock);
+               mutex_unlock(&con->sock_mutex);
+               return -1;
+       }
 
-       /* Is this a new association ? */
-       ni = nodeid2nodeinfo(le32_to_cpu(sinfo->sinfo_ppid), GFP_KERNEL);
-       if (ni) {
-               ni->assoc_id = sinfo->sinfo_assoc_id;
-               if (test_and_clear_bit(NI_INIT_PENDING, &ni->flags)) {
+       log_print("got connection from %d", nodeid);
 
-                       if (!test_and_set_bit(NI_WRITE_PENDING, &ni->flags)) {
-                               spin_lock_bh(&write_nodes_lock);
-                               list_add_tail(&ni->write_list, &write_nodes);
-                               spin_unlock_bh(&write_nodes_lock);
+       /*  Check to see if we already have a connection to this node. This
+        *  could happen if the two nodes initiate a connection at roughly
+        *  the same time and the connections cross on the wire.
+        *  In this case we store the incoming one in "othercon"
+        */
+       newcon = nodeid2con(nodeid, GFP_KERNEL);
+       if (!newcon) {
+               result = -ENOMEM;
+               goto accept_err;
+       }
+       mutex_lock_nested(&newcon->sock_mutex, 1);
+       if (newcon->sock) {
+               struct connection *othercon = newcon->othercon;
+
+               if (!othercon) {
+                       othercon = kmem_cache_zalloc(con_cache, GFP_KERNEL);
+                       if (!othercon) {
+                               log_print("failed to allocate incoming socket");
+                               mutex_unlock(&newcon->sock_mutex);
+                               result = -ENOMEM;
+                               goto accept_err;
                        }
-                       wake_up_process(send_task);
+                       othercon->nodeid = nodeid;
+                       othercon->rx_action = receive_from_sock;
+                       mutex_init(&othercon->sock_mutex);
+                       INIT_WORK(&othercon->swork, process_send_sockets);
+                       INIT_WORK(&othercon->rwork, process_recv_sockets);
+                       set_bit(CF_IS_OTHERCON, &othercon->flags);
+               }
+               if (!othercon->sock) {
+                       newcon->othercon = othercon;
+                       othercon->sock = newsock;
+                       newsock->sk->sk_user_data = othercon;
+                       add_sock(newsock, othercon);
+                       addcon = othercon;
                }
+               else {
+                       printk("Extra connection from node %d attempted\n", nodeid);
+                       result = -EAGAIN;
+                       mutex_unlock(&newcon->sock_mutex);
+                       goto accept_err;
+               }
+       }
+       else {
+               newsock->sk->sk_user_data = newcon;
+               newcon->rx_action = receive_from_sock;
+               add_sock(newsock, newcon);
+               addcon = newcon;
        }
 
-       /* INIT sends a message with length of 1 - ignore it */
-       if (r == 1)
-               return 0;
+       mutex_unlock(&newcon->sock_mutex);
 
-       CBUF_ADD(&sctp_con.cb, ret);
-       ret = dlm_process_incoming_buffer(cpu_to_le32(sinfo->sinfo_ppid),
-                                         page_address(sctp_con.rx_page),
-                                         sctp_con.cb.base, sctp_con.cb.len,
-                                         PAGE_CACHE_SIZE);
-       if (ret < 0)
-               goto out_close;
-       CBUF_EAT(&sctp_con.cb, ret);
-
-      out:
-       ret = 0;
-       goto out_ret;
-
-      out_resched:
-       lowcomms_data_ready(sctp_con.sock->sk, 0);
-       ret = 0;
-       schedule();
-       goto out_ret;
-
-      out_close:
-       if (ret != -EAGAIN)
-               log_print("error reading from sctp socket: %d", ret);
-      out_ret:
-       return ret;
+       /*
+        * Add it to the active queue in case we got data
+        * beween processing the accept adding the socket
+        * to the read_sockets list
+        */
+       if (!test_and_set_bit(CF_READ_PENDING, &addcon->flags))
+               queue_work(recv_workqueue, &addcon->rwork);
+       mutex_unlock(&con->sock_mutex);
+
+       return 0;
+
+accept_err:
+       mutex_unlock(&con->sock_mutex);
+       sock_release(newsock);
+
+       if (result != -EAGAIN)
+               log_print("error accepting connection from node: %d", result);
+       return result;
+}
+
+static void free_entry(struct writequeue_entry *e)
+{
+       __free_page(e->page);
+       kfree(e);
+}
+
+/* Initiate an SCTP association.
+   This is a special case of send_to_sock() in that we don't yet have a
+   peeled-off socket for this association, so we use the listening socket
+   and add the primary IP address of the remote node.
+ */
+static void sctp_init_assoc(struct connection *con)
+{
+       struct sockaddr_storage rem_addr;
+       char outcmsg[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
+       struct msghdr outmessage;
+       struct cmsghdr *cmsg;
+       struct sctp_sndrcvinfo *sinfo;
+       struct connection *base_con;
+       struct writequeue_entry *e;
+       int len, offset;
+       int ret;
+       int addrlen;
+       struct kvec iov[1];
+
+       if (test_and_set_bit(CF_INIT_PENDING, &con->flags))
+               return;
+
+       if (con->retries++ > MAX_CONNECT_RETRIES)
+               return;
+
+       log_print("Initiating association with node %d", con->nodeid);
+
+       if (nodeid_to_addr(con->nodeid, (struct sockaddr *)&rem_addr)) {
+               log_print("no address for nodeid %d", con->nodeid);
+               return;
+       }
+       base_con = nodeid2con(0, 0);
+       BUG_ON(base_con == NULL);
+
+       make_sockaddr(&rem_addr, dlm_config.ci_tcp_port, &addrlen);
+
+       outmessage.msg_name = &rem_addr;
+       outmessage.msg_namelen = addrlen;
+       outmessage.msg_control = outcmsg;
+       outmessage.msg_controllen = sizeof(outcmsg);
+       outmessage.msg_flags = MSG_EOR;
+
+       spin_lock(&con->writequeue_lock);
+       e = list_entry(con->writequeue.next, struct writequeue_entry,
+                      list);
+
+       BUG_ON((struct list_head *) e == &con->writequeue);
+
+       len = e->len;
+       offset = e->offset;
+       spin_unlock(&con->writequeue_lock);
+       kmap(e->page);
+
+       /* Send the first block off the write queue */
+       iov[0].iov_base = page_address(e->page)+offset;
+       iov[0].iov_len = len;
+
+       cmsg = CMSG_FIRSTHDR(&outmessage);
+       cmsg->cmsg_level = IPPROTO_SCTP;
+       cmsg->cmsg_type = SCTP_SNDRCV;
+       cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
+       sinfo = CMSG_DATA(cmsg);
+       memset(sinfo, 0x00, sizeof(struct sctp_sndrcvinfo));
+       sinfo->sinfo_ppid = cpu_to_le32(dlm_our_nodeid());
+       outmessage.msg_controllen = cmsg->cmsg_len;
+
+       ret = kernel_sendmsg(base_con->sock, &outmessage, iov, 1, len);
+       if (ret < 0) {
+               log_print("Send first packet to node %d failed: %d",
+                         con->nodeid, ret);
+
+               /* Try again later */
+               clear_bit(CF_CONNECT_PENDING, &con->flags);
+               clear_bit(CF_INIT_PENDING, &con->flags);
+       }
+       else {
+               spin_lock(&con->writequeue_lock);
+               e->offset += ret;
+               e->len -= ret;
+
+               if (e->len == 0 && e->users == 0) {
+                       list_del(&e->list);
+                       kunmap(e->page);
+                       free_entry(e);
+               }
+               spin_unlock(&con->writequeue_lock);
+       }
+}
+
+/* Connect a new socket to its peer */
+static void tcp_connect_to_sock(struct connection *con)
+{
+       int result = -EHOSTUNREACH;
+       struct sockaddr_storage saddr;
+       int addr_len;
+       struct socket *sock;
+
+       if (con->nodeid == 0) {
+               log_print("attempt to connect sock 0 foiled");
+               return;
+       }
+
+       mutex_lock(&con->sock_mutex);
+       if (con->retries++ > MAX_CONNECT_RETRIES)
+               goto out;
+
+       /* Some odd races can cause double-connects, ignore them */
+       if (con->sock) {
+               result = 0;
+               goto out;
+       }
+
+       /* Create a socket to communicate with */
+       result = sock_create_kern(dlm_local_addr[0]->ss_family, SOCK_STREAM,
+                                 IPPROTO_TCP, &sock);
+       if (result < 0)
+               goto out_err;
+
+       memset(&saddr, 0, sizeof(saddr));
+       if (dlm_nodeid_to_addr(con->nodeid, &saddr))
+               goto out_err;
+
+       sock->sk->sk_user_data = con;
+       con->rx_action = receive_from_sock;
+       con->connect_action = tcp_connect_to_sock;
+       add_sock(sock, con);
+
+       make_sockaddr(&saddr, dlm_config.ci_tcp_port, &addr_len);
+
+       log_print("connecting to %d", con->nodeid);
+       result =
+               sock->ops->connect(sock, (struct sockaddr *)&saddr, addr_len,
+                                  O_NONBLOCK);
+       if (result == -EINPROGRESS)
+               result = 0;
+       if (result == 0)
+               goto out;
+
+out_err:
+       if (con->sock) {
+               sock_release(con->sock);
+               con->sock = NULL;
+       }
+       /*
+        * Some errors are fatal and this list might need adjusting. For other
+        * errors we try again until the max number of retries is reached.
+        */
+       if (result != -EHOSTUNREACH && result != -ENETUNREACH &&
+           result != -ENETDOWN && result != EINVAL
+           && result != -EPROTONOSUPPORT) {
+               lowcomms_connect_sock(con);
+               result = 0;
+       }
+out:
+       mutex_unlock(&con->sock_mutex);
+       return;
 }
 
-/* Bind to an IP address. SCTP allows multiple address so it can do multi-homing */
-static int add_bind_addr(struct sockaddr_storage *addr, int addr_len, int num)
+static struct socket *tcp_create_listen_sock(struct connection *con,
+                                            struct sockaddr_storage *saddr)
 {
-       mm_segment_t fs;
+       struct socket *sock = NULL;
        int result = 0;
+       int one = 1;
+       int addr_len;
 
-       fs = get_fs();
-       set_fs(get_ds());
-       if (num == 1)
-               result = sctp_con.sock->ops->bind(sctp_con.sock,
-                                       (struct sockaddr *) addr, addr_len);
+       if (dlm_local_addr[0]->ss_family == AF_INET)
+               addr_len = sizeof(struct sockaddr_in);
        else
-               result = sctp_con.sock->ops->setsockopt(sctp_con.sock, SOL_SCTP,
-                               SCTP_SOCKOPT_BINDX_ADD, (char *)addr, addr_len);
-       set_fs(fs);
+               addr_len = sizeof(struct sockaddr_in6);
 
-       if (result < 0)
-               log_print("Can't bind to port %d addr number %d",
-                         dlm_config.tcp_port, num);
+       /* Create a socket to communicate with */
+       result = sock_create_kern(dlm_local_addr[0]->ss_family, SOCK_STREAM,
+                                 IPPROTO_TCP, &sock);
+       if (result < 0) {
+               log_print("Can't create listening comms socket");
+               goto create_out;
+       }
 
-       return result;
+       result = kernel_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
+                                  (char *)&one, sizeof(one));
+
+       if (result < 0) {
+               log_print("Failed to set SO_REUSEADDR on socket: %d", result);
+       }
+       sock->sk->sk_user_data = con;
+       con->rx_action = tcp_accept_from_sock;
+       con->connect_action = tcp_connect_to_sock;
+       con->sock = sock;
+
+       /* Bind to our port */
+       make_sockaddr(saddr, dlm_config.ci_tcp_port, &addr_len);
+       result = sock->ops->bind(sock, (struct sockaddr *) saddr, addr_len);
+       if (result < 0) {
+               log_print("Can't bind to port %d", dlm_config.ci_tcp_port);
+               sock_release(sock);
+               sock = NULL;
+               con->sock = NULL;
+               goto create_out;
+       }
+       result = kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
+                                (char *)&one, sizeof(one));
+       if (result < 0) {
+               log_print("Set keepalive failed: %d", result);
+       }
+
+       result = sock->ops->listen(sock, 5);
+       if (result < 0) {
+               log_print("Can't listen on port %d", dlm_config.ci_tcp_port);
+               sock_release(sock);
+               sock = NULL;
+               goto create_out;
+       }
+
+create_out:
+       return sock;
 }
 
+/* Get local addresses */
 static void init_local(void)
 {
        struct sockaddr_storage sas, *addr;
        int i;
 
-       dlm_local_nodeid = dlm_our_nodeid();
-
+       dlm_local_count = 0;
        for (i = 0; i < DLM_MAX_ADDR_COUNT - 1; i++) {
                if (dlm_our_addr(&sas, i))
                        break;
@@ -651,22 +1008,44 @@ static void init_local(void)
        }
 }
 
+/* Bind to an IP address. SCTP allows multiple address so it can do
+   multi-homing */
+static int add_sctp_bind_addr(struct connection *sctp_con,
+                             struct sockaddr_storage *addr,
+                             int addr_len, int num)
+{
+       int result = 0;
+
+       if (num == 1)
+               result = kernel_bind(sctp_con->sock,
+                                    (struct sockaddr *) addr,
+                                    addr_len);
+       else
+               result = kernel_setsockopt(sctp_con->sock, SOL_SCTP,
+                                          SCTP_SOCKOPT_BINDX_ADD,
+                                          (char *)addr, addr_len);
+
+       if (result < 0)
+               log_print("Can't bind to port %d addr number %d",
+                         dlm_config.ci_tcp_port, num);
+
+       return result;
+}
+
 /* Initialise SCTP socket and bind to all interfaces */
-static int init_sock(void)
+static int sctp_listen_for_all(void)
 {
-       mm_segment_t fs;
        struct socket *sock = NULL;
        struct sockaddr_storage localaddr;
        struct sctp_event_subscribe subscribe;
        int result = -EINVAL, num = 1, i, addr_len;
+       struct connection *con = nodeid2con(0, GFP_KERNEL);
+       int bufsize = NEEDED_RMEM;
 
-       if (!dlm_local_count) {
-               init_local();
-               if (!dlm_local_count) {
-                       log_print("no local IP address has been set");
-                       goto out;
-               }
-       }
+       if (!con)
+               return -ENOMEM;
+
+       log_print("Using SCTP for communications");
 
        result = sock_create_kern(dlm_local_addr[0]->ss_family, SOCK_SEQPACKET,
                                  IPPROTO_SCTP, &sock);
@@ -683,12 +1062,13 @@ static int init_sock(void)
        subscribe.sctp_shutdown_event = 1;
        subscribe.sctp_partial_delivery_event = 1;
 
-       fs = get_fs();
-       set_fs(get_ds());
-       result = sock->ops->setsockopt(sock, SOL_SCTP, SCTP_EVENTS,
-                                      (char *)&subscribe, sizeof(subscribe));
-       set_fs(fs);
+       result = kernel_setsockopt(sock, SOL_SOCKET, SO_RCVBUFFORCE,
+                                (char *)&bufsize, sizeof(bufsize));
+       if (result)
+               log_print("Error increasing buffer space on socket %d", result);
 
+       result = kernel_setsockopt(sock, SOL_SCTP, SCTP_EVENTS,
+                                  (char *)&subscribe, sizeof(subscribe));
        if (result < 0) {
                log_print("Failed to set SCTP_EVENTS on socket: result=%d",
                          result);
@@ -696,16 +1076,18 @@ static int init_sock(void)
        }
 
        /* Init con struct */
-       sock->sk->sk_user_data = &sctp_con;
-       sctp_con.sock = sock;
-       sctp_con.sock->sk->sk_data_ready = lowcomms_data_ready;
+       sock->sk->sk_user_data = con;
+       con->sock = sock;
+       con->sock->sk->sk_data_ready = lowcomms_data_ready;
+       con->rx_action = receive_from_sock;
+       con->connect_action = sctp_init_assoc;
 
        /* Bind to all interfaces. */
        for (i = 0; i < dlm_local_count; i++) {
                memcpy(&localaddr, dlm_local_addr[i], sizeof(localaddr));
-               make_sockaddr(&localaddr, dlm_config.tcp_port, &addr_len);
+               make_sockaddr(&localaddr, dlm_config.ci_tcp_port, &addr_len);
 
-               result = add_bind_addr(&localaddr, addr_len, num);
+               result = add_sctp_bind_addr(con, &localaddr, addr_len, num);
                if (result)
                        goto create_delsock;
                ++num;
@@ -719,15 +1101,47 @@ static int init_sock(void)
 
        return 0;
 
- create_delsock:
+create_delsock:
        sock_release(sock);
-       sctp_con.sock = NULL;
- out:
+       con->sock = NULL;
+out:
+       return result;
+}
+
+static int tcp_listen_for_all(void)
+{
+       struct socket *sock = NULL;
+       struct connection *con = nodeid2con(0, GFP_KERNEL);
+       int result = -EINVAL;
+
+       if (!con)
+               return -ENOMEM;
+
+       /* We don't support multi-homed hosts */
+       if (dlm_local_addr[1] != NULL) {
+               log_print("TCP protocol can't handle multi-homed hosts, "
+                         "try SCTP");
+               return -EINVAL;
+       }
+
+       log_print("Using TCP for communications");
+
+       sock = tcp_create_listen_sock(con, dlm_local_addr[0]);
+       if (sock) {
+               add_sock(sock, con);
+               result = 0;
+       }
+       else {
+               result = -EADDRINUSE;
+       }
+
        return result;
 }
 
 
-static struct writequeue_entry *new_writequeue_entry(gfp_t allocation)
+
+static struct writequeue_entry *new_writequeue_entry(struct connection *con,
+                                                    gfp_t allocation)
 {
        struct writequeue_entry *entry;
 
@@ -745,27 +1159,25 @@ static struct writequeue_entry *new_writequeue_entry(gfp_t allocation)
        entry->len = 0;
        entry->end = 0;
        entry->users = 0;
+       entry->con = con;
 
        return entry;
 }
 
 void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc)
 {
+       struct connection *con;
        struct writequeue_entry *e;
        int offset = 0;
        int users = 0;
-       struct nodeinfo *ni;
-
-       if (!atomic_read(&accepting))
-               return NULL;
 
-       ni = nodeid2nodeinfo(nodeid, allocation);
-       if (!ni)
+       con = nodeid2con(nodeid, allocation);
+       if (!con)
                return NULL;
 
-       spin_lock(&ni->writequeue_lock);
-       e = list_entry(ni->writequeue.prev, struct writequeue_entry, list);
-       if (((struct list_head *) e == &ni->writequeue) ||
+       spin_lock(&con->writequeue_lock);
+       e = list_entry(con->writequeue.prev, struct writequeue_entry, list);
+       if ((&e->list == &con->writequeue) ||
            (PAGE_CACHE_SIZE - e->end < len)) {
                e = NULL;
        } else {
@@ -773,467 +1185,297 @@ void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc)
                e->end += len;
                users = e->users++;
        }
-       spin_unlock(&ni->writequeue_lock);
+       spin_unlock(&con->writequeue_lock);
 
        if (e) {
-             got_one:
+       got_one:
                if (users == 0)
                        kmap(e->page);
                *ppc = page_address(e->page) + offset;
                return e;
        }
 
-       e = new_writequeue_entry(allocation);
+       e = new_writequeue_entry(con, allocation);
        if (e) {
-               spin_lock(&ni->writequeue_lock);
+               spin_lock(&con->writequeue_lock);
                offset = e->end;
                e->end += len;
-               e->ni = ni;
                users = e->users++;
-               list_add_tail(&e->list, &ni->writequeue);
-               spin_unlock(&ni->writequeue_lock);
+               list_add_tail(&e->list, &con->writequeue);
+               spin_unlock(&con->writequeue_lock);
                goto got_one;
        }
        return NULL;
 }
 
-void dlm_lowcomms_commit_buffer(void *arg)
+void dlm_lowcomms_commit_buffer(void *mh)
 {
-       struct writequeue_entry *e = (struct writequeue_entry *) arg;
+       struct writequeue_entry *e = (struct writequeue_entry *)mh;
+       struct connection *con = e->con;
        int users;
-       struct nodeinfo *ni = e->ni;
 
-       if (!atomic_read(&accepting))
-               return;
-
-       spin_lock(&ni->writequeue_lock);
+       spin_lock(&con->writequeue_lock);
        users = --e->users;
        if (users)
                goto out;
        e->len = e->end - e->offset;
        kunmap(e->page);
-       spin_unlock(&ni->writequeue_lock);
+       spin_unlock(&con->writequeue_lock);
 
-       if (!test_and_set_bit(NI_WRITE_PENDING, &ni->flags)) {
-               spin_lock_bh(&write_nodes_lock);
-               list_add_tail(&ni->write_list, &write_nodes);
-               spin_unlock_bh(&write_nodes_lock);
-               wake_up_process(send_task);
+       if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags)) {
+               queue_work(send_workqueue, &con->swork);
        }
        return;
 
-      out:
-       spin_unlock(&ni->writequeue_lock);
+out:
+       spin_unlock(&con->writequeue_lock);
        return;
 }
 
-static void free_entry(struct writequeue_entry *e)
-{
-       __free_page(e->page);
-       kfree(e);
-}
-
-/* Initiate an SCTP association. In theory we could just use sendmsg() on
-   the first IP address and it should work, but this allows us to set up the
-   association before sending any valuable data that we can't afford to lose.
-   It also keeps the send path clean as it can now always use the association ID */
-static void initiate_association(int nodeid)
-{
-       struct sockaddr_storage rem_addr;
-       static char outcmsg[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
-       struct msghdr outmessage;
-       struct cmsghdr *cmsg;
-       struct sctp_sndrcvinfo *sinfo;
-       int ret;
-       int addrlen;
-       char buf[1];
-       struct kvec iov[1];
-       struct nodeinfo *ni;
-
-       log_print("Initiating association with node %d", nodeid);
-
-       ni = nodeid2nodeinfo(nodeid, GFP_KERNEL);
-       if (!ni)
-               return;
-
-       if (nodeid_to_addr(nodeid, (struct sockaddr *)&rem_addr)) {
-               log_print("no address for nodeid %d", nodeid);
-               return;
-       }
-
-       make_sockaddr(&rem_addr, dlm_config.tcp_port, &addrlen);
-
-       outmessage.msg_name = &rem_addr;
-       outmessage.msg_namelen = addrlen;
-       outmessage.msg_control = outcmsg;
-       outmessage.msg_controllen = sizeof(outcmsg);
-       outmessage.msg_flags = MSG_EOR;
-
-       iov[0].iov_base = buf;
-       iov[0].iov_len = 1;
-
-       /* Real INIT messages seem to cause trouble. Just send a 1 byte message
-          we can afford to lose */
-       cmsg = CMSG_FIRSTHDR(&outmessage);
-       cmsg->cmsg_level = IPPROTO_SCTP;
-       cmsg->cmsg_type = SCTP_SNDRCV;
-       cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
-       sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
-       memset(sinfo, 0x00, sizeof(struct sctp_sndrcvinfo));
-       sinfo->sinfo_ppid = cpu_to_le32(dlm_local_nodeid);
-
-       outmessage.msg_controllen = cmsg->cmsg_len;
-       ret = kernel_sendmsg(sctp_con.sock, &outmessage, iov, 1, 1);
-       if (ret < 0) {
-               log_print("send INIT to node failed: %d", ret);
-               /* Try again later */
-               clear_bit(NI_INIT_PENDING, &ni->flags);
-       }
-}
-
 /* Send a message */
-static int send_to_sock(struct nodeinfo *ni)
+static void send_to_sock(struct connection *con)
 {
        int ret = 0;
+       ssize_t(*sendpage) (struct socket *, struct page *, int, size_t, int);
+       const int msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL;
        struct writequeue_entry *e;
        int len, offset;
-       struct msghdr outmsg;
-       static char outcmsg[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
-       struct cmsghdr *cmsg;
-       struct sctp_sndrcvinfo *sinfo;
-       struct kvec iov;
-
-        /* See if we need to init an association before we start
-          sending precious messages */
-       spin_lock(&ni->lock);
-       if (!ni->assoc_id && !test_and_set_bit(NI_INIT_PENDING, &ni->flags)) {
-               spin_unlock(&ni->lock);
-               initiate_association(ni->nodeid);
-               return 0;
-       }
-       spin_unlock(&ni->lock);
 
-       outmsg.msg_name = NULL; /* We use assoc_id */
-       outmsg.msg_namelen = 0;
-       outmsg.msg_control = outcmsg;
-       outmsg.msg_controllen = sizeof(outcmsg);
-       outmsg.msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL | MSG_EOR;
+       mutex_lock(&con->sock_mutex);
+       if (con->sock == NULL)
+               goto out_connect;
 
-       cmsg = CMSG_FIRSTHDR(&outmsg);
-       cmsg->cmsg_level = IPPROTO_SCTP;
-       cmsg->cmsg_type = SCTP_SNDRCV;
-       cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
-       sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
-       memset(sinfo, 0x00, sizeof(struct sctp_sndrcvinfo));
-       sinfo->sinfo_ppid = cpu_to_le32(dlm_local_nodeid);
-       sinfo->sinfo_assoc_id = ni->assoc_id;
-       outmsg.msg_controllen = cmsg->cmsg_len;
+       sendpage = con->sock->ops->sendpage;
 
-       spin_lock(&ni->writequeue_lock);
+       spin_lock(&con->writequeue_lock);
        for (;;) {
-               if (list_empty(&ni->writequeue))
-                       break;
-               e = list_entry(ni->writequeue.next, struct writequeue_entry,
+               e = list_entry(con->writequeue.next, struct writequeue_entry,
                               list);
+               if ((struct list_head *) e == &con->writequeue)
+                       break;
+
                len = e->len;
                offset = e->offset;
                BUG_ON(len == 0 && e->users == 0);
-               spin_unlock(&ni->writequeue_lock);
+               spin_unlock(&con->writequeue_lock);
                kmap(e->page);
 
                ret = 0;
                if (len) {
-                       iov.iov_base = page_address(e->page)+offset;
-                       iov.iov_len = len;
-
-                       ret = kernel_sendmsg(sctp_con.sock, &outmsg, &iov, 1,
-                                            len);
-                       if (ret == -EAGAIN) {
-                               sctp_con.eagain_flag = 1;
+                       ret = sendpage(con->sock, e->page, offset, len,
+                                      msg_flags);
+                       if (ret == -EAGAIN || ret == 0) {
+                               cond_resched();
                                goto out;
-                       } else if (ret < 0)
+                       }
+                       if (ret <= 0)
                                goto send_error;
-               } else {
-                       /* Don't starve people filling buffers */
-                       schedule();
                }
+                       /* Don't starve people filling buffers */
+                       cond_resched();
 
-               spin_lock(&ni->writequeue_lock);
+               spin_lock(&con->writequeue_lock);
                e->offset += ret;
                e->len -= ret;
 
                if (e->len == 0 && e->users == 0) {
                        list_del(&e->list);
+                       kunmap(e->page);
                        free_entry(e);
                        continue;
                }
        }
-       spin_unlock(&ni->writequeue_lock);
- out:
-       return ret;
-
- send_error:
-       log_print("Error sending to node %d %d", ni->nodeid, ret);
-       spin_lock(&ni->lock);
-       if (!test_and_set_bit(NI_INIT_PENDING, &ni->flags)) {
-               ni->assoc_id = 0;
-               spin_unlock(&ni->lock);
-               initiate_association(ni->nodeid);
-       } else
-               spin_unlock(&ni->lock);
-
-       return ret;
-}
-
-/* Try to send any messages that are pending */
-static void process_output_queue(void)
-{
-       struct list_head *list;
-       struct list_head *temp;
-
-       spin_lock_bh(&write_nodes_lock);
-       list_for_each_safe(list, temp, &write_nodes) {
-               struct nodeinfo *ni =
-                   list_entry(list, struct nodeinfo, write_list);
-               clear_bit(NI_WRITE_PENDING, &ni->flags);
-               list_del(&ni->write_list);
-
-               spin_unlock_bh(&write_nodes_lock);
-
-               send_to_sock(ni);
-               spin_lock_bh(&write_nodes_lock);
-       }
-       spin_unlock_bh(&write_nodes_lock);
-}
-
-/* Called after we've had -EAGAIN and been woken up */
-static void refill_write_queue(void)
-{
-       int i;
+       spin_unlock(&con->writequeue_lock);
+out:
+       mutex_unlock(&con->sock_mutex);
+       return;
 
-       for (i=1; i<=max_nodeid; i++) {
-               struct nodeinfo *ni = nodeid2nodeinfo(i, 0);
+send_error:
+       mutex_unlock(&con->sock_mutex);
+       close_connection(con, false);
+       lowcomms_connect_sock(con);
+       return;
 
-               if (ni) {
-                       if (!test_and_set_bit(NI_WRITE_PENDING, &ni->flags)) {
-                               spin_lock_bh(&write_nodes_lock);
-                               list_add_tail(&ni->write_list, &write_nodes);
-                               spin_unlock_bh(&write_nodes_lock);
-                       }
-               }
-       }
+out_connect:
+       mutex_unlock(&con->sock_mutex);
+       if (!test_bit(CF_INIT_PENDING, &con->flags))
+               lowcomms_connect_sock(con);
+       return;
 }
 
-static void clean_one_writequeue(struct nodeinfo *ni)
+static void clean_one_writequeue(struct connection *con)
 {
        struct list_head *list;
        struct list_head *temp;
 
-       spin_lock(&ni->writequeue_lock);
-       list_for_each_safe(list, temp, &ni->writequeue) {
+       spin_lock(&con->writequeue_lock);
+       list_for_each_safe(list, temp, &con->writequeue) {
                struct writequeue_entry *e =
                        list_entry(list, struct writequeue_entry, list);
                list_del(&e->list);
                free_entry(e);
        }
-       spin_unlock(&ni->writequeue_lock);
-}
-
-static void clean_writequeues(void)
-{
-       int i;
-
-       for (i=1; i<=max_nodeid; i++) {
-               struct nodeinfo *ni = nodeid2nodeinfo(i, 0);
-               if (ni)
-                       clean_one_writequeue(ni);
-       }
-}
-
-
-static void dealloc_nodeinfo(void)
-{
-       int i;
-
-       for (i=1; i<=max_nodeid; i++) {
-               struct nodeinfo *ni = nodeid2nodeinfo(i, 0);
-               if (ni) {
-                       idr_remove(&nodeinfo_idr, i);
-                       kfree(ni);
-               }
-       }
+       spin_unlock(&con->writequeue_lock);
 }
 
+/* Called from recovery when it knows that a node has
+   left the cluster */
 int dlm_lowcomms_close(int nodeid)
 {
-       struct nodeinfo *ni;
+       struct connection *con;
 
-       ni = nodeid2nodeinfo(nodeid, 0);
-       if (!ni)
-               return -1;
-
-       spin_lock(&ni->lock);
-       if (ni->assoc_id) {
-               ni->assoc_id = 0;
-               /* Don't send shutdown here, sctp will just queue it
-                  till the node comes back up! */
+       log_print("closing connection to node %d", nodeid);
+       con = nodeid2con(nodeid, 0);
+       if (con) {
+               clean_one_writequeue(con);
+               close_connection(con, true);
        }
-       spin_unlock(&ni->lock);
-
-       clean_one_writequeue(ni);
-       clear_bit(NI_INIT_PENDING, &ni->flags);
        return 0;
 }
 
-static int write_list_empty(void)
+/* Receive workqueue function */
+static void process_recv_sockets(struct work_struct *work)
 {
-       int status;
+       struct connection *con = container_of(work, struct connection, rwork);
+       int err;
 
-       spin_lock_bh(&write_nodes_lock);
-       status = list_empty(&write_nodes);
-       spin_unlock_bh(&write_nodes_lock);
-
-       return status;
+       clear_bit(CF_READ_PENDING, &con->flags);
+       do {
+               err = con->rx_action(con);
+       } while (!err);
 }
 
-static int dlm_recvd(void *data)
+/* Send workqueue function */
+static void process_send_sockets(struct work_struct *work)
 {
-       DECLARE_WAITQUEUE(wait, current);
-
-       while (!kthread_should_stop()) {
-               int count = 0;
-
-               set_current_state(TASK_INTERRUPTIBLE);
-               add_wait_queue(&lowcomms_recv_wait, &wait);
-               if (!test_bit(CF_READ_PENDING, &sctp_con.flags))
-                       schedule();
-               remove_wait_queue(&lowcomms_recv_wait, &wait);
-               set_current_state(TASK_RUNNING);
-
-               if (test_and_clear_bit(CF_READ_PENDING, &sctp_con.flags)) {
-                       int ret;
-
-                       do {
-                               ret = receive_from_sock();
-
-                               /* Don't starve out everyone else */
-                               if (++count >= MAX_RX_MSG_COUNT) {
-                                       schedule();
-                                       count = 0;
-                               }
-                       } while (!kthread_should_stop() && ret >=0);
-               }
-               schedule();
-       }
+       struct connection *con = container_of(work, struct connection, swork);
 
-       return 0;
+       if (test_and_clear_bit(CF_CONNECT_PENDING, &con->flags)) {
+               con->connect_action(con);
+       }
+       clear_bit(CF_WRITE_PENDING, &con->flags);
+       send_to_sock(con);
 }
 
-static int dlm_sendd(void *data)
-{
-       DECLARE_WAITQUEUE(wait, current);
 
-       add_wait_queue(sctp_con.sock->sk->sk_sleep, &wait);
+/* Discard all entries on the write queues */
+static void clean_writequeues(void)
+{
+       int nodeid;
 
-       while (!kthread_should_stop()) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               if (write_list_empty())
-                       schedule();
-               set_current_state(TASK_RUNNING);
+       for (nodeid = 1; nodeid <= max_nodeid; nodeid++) {
+               struct connection *con = __nodeid2con(nodeid, 0);
 
-               if (sctp_con.eagain_flag) {
-                       sctp_con.eagain_flag = 0;
-                       refill_write_queue();
-               }
-               process_output_queue();
+               if (con)
+                       clean_one_writequeue(con);
        }
-
-       remove_wait_queue(sctp_con.sock->sk->sk_sleep, &wait);
-
-       return 0;
 }
 
-static void daemons_stop(void)
+static void work_stop(void)
 {
-       kthread_stop(recv_task);
-       kthread_stop(send_task);
+       destroy_workqueue(recv_workqueue);
+       destroy_workqueue(send_workqueue);
 }
 
-static int daemons_start(void)
+static int work_start(void)
 {
-       struct task_struct *p;
        int error;
-
-       p = kthread_run(dlm_recvd, NULL, "dlm_recvd");
-       error = IS_ERR(p);
-               if (error) {
-               log_print("can't start dlm_recvd %d", error);
+       recv_workqueue = create_workqueue("dlm_recv");
+       error = IS_ERR(recv_workqueue);
+       if (error) {
+               log_print("can't start dlm_recv %d", error);
                return error;
        }
-       recv_task = p;
 
-       p = kthread_run(dlm_sendd, NULL, "dlm_sendd");
-       error = IS_ERR(p);
-               if (error) {
-               log_print("can't start dlm_sendd %d", error);
-               kthread_stop(recv_task);
+       send_workqueue = create_singlethread_workqueue("dlm_send");
+       error = IS_ERR(send_workqueue);
+       if (error) {
+               log_print("can't start dlm_send %d", error);
+               destroy_workqueue(recv_workqueue);
                return error;
        }
-       send_task = p;
 
        return 0;
 }
 
-/*
- * This is quite likely to sleep...
- */
-int dlm_lowcomms_start(void)
+void dlm_lowcomms_stop(void)
 {
-       int error;
-
-       error = init_sock();
-       if (error)
-               goto fail_sock;
-       error = daemons_start();
-       if (error)
-               goto fail_sock;
-       atomic_set(&accepting, 1);
-       return 0;
-
- fail_sock:
-       close_connection();
-       return error;
-}
+       int i;
+       struct connection *con;
+
+       /* Set all the flags to prevent any
+          socket activity.
+       */
+       down(&connections_lock);
+       for (i = 0; i <= max_nodeid; i++) {
+               con = __nodeid2con(i, 0);
+               if (con) {
+                       con->flags |= 0x0F;
+                       if (con->sock)
+                               con->sock->sk->sk_user_data = NULL;
+               }
+       }
+       up(&connections_lock);
 
-/* Set all the activity flags to prevent any socket activity. */
+       work_stop();
 
-void dlm_lowcomms_stop(void)
-{
-       atomic_set(&accepting, 0);
-       sctp_con.flags = 0x7;
-       daemons_stop();
+       down(&connections_lock);
        clean_writequeues();
-       close_connection();
-       dealloc_nodeinfo();
+
+       for (i = 0; i <= max_nodeid; i++) {
+               con = __nodeid2con(i, 0);
+               if (con) {
+                       close_connection(con, true);
+                       kmem_cache_free(con_cache, con);
+               }
+       }
        max_nodeid = 0;
+       up(&connections_lock);
+       kmem_cache_destroy(con_cache);
+       idr_init(&connections_idr);
 }
 
-int dlm_lowcomms_init(void)
+int dlm_lowcomms_start(void)
 {
-       init_waitqueue_head(&lowcomms_recv_wait);
-       spin_lock_init(&write_nodes_lock);
-       INIT_LIST_HEAD(&write_nodes);
-       init_rwsem(&nodeinfo_lock);
+       int error = -EINVAL;
+       struct connection *con;
+
+       init_local();
+       if (!dlm_local_count) {
+               error = -ENOTCONN;
+               log_print("no local IP address has been set");
+               goto out;
+       }
+
+       error = -ENOMEM;
+       con_cache = kmem_cache_create("dlm_conn", sizeof(struct connection),
+                                     __alignof__(struct connection), 0,
+                                     NULL);
+       if (!con_cache)
+               goto out;
+
+       /* Start listening */
+       if (dlm_config.ci_protocol == 0)
+               error = tcp_listen_for_all();
+       else
+               error = sctp_listen_for_all();
+       if (error)
+               goto fail_unlisten;
+
+       error = work_start();
+       if (error)
+               goto fail_unlisten;
+
        return 0;
-}
 
-void dlm_lowcomms_exit(void)
-{
-       int i;
+fail_unlisten:
+       con = nodeid2con(0,0);
+       if (con) {
+               close_connection(con, false);
+               kmem_cache_free(con_cache, con);
+       }
+       kmem_cache_destroy(con_cache);
 
-       for (i = 0; i < dlm_local_count; i++)
-               kfree(dlm_local_addr[i]);
-       dlm_local_count = 0;
-       dlm_local_nodeid = 0;
+out:
+       return error;
 }
-