Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 22:05:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fs: dlm: move connect callback in node creation

Browse Source 
This patch moves the assignment for the connect callback to the node
creation instead of assign some dummy functionality. The assignment
which connect functionality will be used will be detected according to
the configfs setting.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
Alexander Aring 2020-11-02 20:04:22 -05:00 committed by David Teigland
parent 6cde210a97
commit 0672c3c280
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/dlm/lowcomms.c
View File

@ -142,6 +142,8 @@ DEFINE_STATIC_SRCU(connections_srcu);
static void process_recv_sockets(struct work_struct *work); static void process_recv_sockets(struct work_struct *work);
static void process_send_sockets(struct work_struct *work); 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);
/* This is deliberately very simple because most clusters have simple /* This is deliberately very simple because most clusters have simple
sequential nodeids, so we should be able to go straight to a connection sequential nodeids, so we should be able to go straight to a connection
@ -185,14 +187,10 @@ static int dlm_con_init(struct connection *con, int nodeid)
INIT_WORK(&con->rwork, process_recv_sockets); INIT_WORK(&con->rwork, process_recv_sockets);
init_waitqueue_head(&con->shutdown_wait); init_waitqueue_head(&con->shutdown_wait);
/* Setup action pointers for child sockets */ if (dlm_config.ci_protocol == 0)
if (con->nodeid) { con->connect_action = tcp_connect_to_sock;
struct connection *zerocon = __find_con(0); else
con->connect_action = sctp_connect_to_sock;
con->connect_action = zerocon->connect_action;
if (!con->rx_action)
con->rx_action = zerocon->rx_action;
}
return 0; return 0;
} }
@ -1006,7 +1004,6 @@ static void sctp_connect_to_sock(struct connection *con)
sock_set_mark(sock->sk, mark); sock_set_mark(sock->sk, mark);
con->rx_action = receive_from_sock; con->rx_action = receive_from_sock;
con->connect_action = sctp_connect_to_sock;
add_sock(sock, con); add_sock(sock, con);
/* Bind to all addresses. */ /* Bind to all addresses. */
@ -1104,7 +1101,6 @@ static void tcp_connect_to_sock(struct connection *con)
} }
con->rx_action = receive_from_sock; con->rx_action = receive_from_sock;
con->connect_action = tcp_connect_to_sock;
con->shutdown_action = dlm_tcp_shutdown; con->shutdown_action = dlm_tcp_shutdown;
add_sock(sock, con); add_sock(sock, con);
@ -1192,7 +1188,6 @@ static struct socket *tcp_create_listen_sock(struct connection *con,
sock->sk->sk_user_data = con; sock->sk->sk_user_data = con;
save_listen_callbacks(sock); save_listen_callbacks(sock);
con->rx_action = accept_from_sock; con->rx_action = accept_from_sock;
con->connect_action = tcp_connect_to_sock;
write_unlock_bh(&sock->sk->sk_callback_lock); write_unlock_bh(&sock->sk->sk_callback_lock);
/* Bind to our port */ /* Bind to our port */
@ -1275,7 +1270,6 @@ static int sctp_listen_for_all(void)
con->sock = sock; con->sock = sock;
con->sock->sk->sk_data_ready = lowcomms_data_ready; con->sock->sk->sk_data_ready = lowcomms_data_ready;
con->rx_action = accept_from_sock; con->rx_action = accept_from_sock;
con->connect_action = sctp_connect_to_sock;
write_unlock_bh(&sock->sk->sk_callback_lock); write_unlock_bh(&sock->sk->sk_callback_lock);