fs: dlm: move shutdown action to node creation

This patch move the assignment for the shutdown action callback to the
node creation functionality.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 30a101de0a0c65e3d4011d0ab2fc0d6f223dd7e2..9723df4e67b8d01c68d0cb67852117644fb435cf 100644 (file)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -144,6 +144,7 @@ static void process_send_sockets(struct work_struct *work);
 
 static void sctp_connect_to_sock(struct connection *con);
 static void tcp_connect_to_sock(struct connection *con);
+static void dlm_tcp_shutdown(struct connection *con);
 
 /* This is deliberately very simple because most clusters have simple
    sequential nodeids, so we should be able to go straight to a connection
@@ -187,10 +188,12 @@ static int dlm_con_init(struct connection *con, int nodeid)
        INIT_WORK(&con->rwork, process_recv_sockets);
        init_waitqueue_head(&con->shutdown_wait);
 
-       if (dlm_config.ci_protocol == 0)
+       if (dlm_config.ci_protocol == 0) {
                con->connect_action = tcp_connect_to_sock;
-       else
+               con->shutdown_action = dlm_tcp_shutdown;
+       } else {
                con->connect_action = sctp_connect_to_sock;
+       }
 
        return 0;
 }
@@ -1101,7 +1104,6 @@ static void tcp_connect_to_sock(struct connection *con)
        }
 
        con->rx_action = receive_from_sock;
-       con->shutdown_action = dlm_tcp_shutdown;
        add_sock(sock, con);
 
        /* Bind to our cluster-known address connecting to avoid