hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DLM: fix remove save_cb argument from add_sock() 

save_cb argument is not used. We remove them.

Signed-off-by: Tadashi Miyauchi <miyauchi@toshiba-tops.co.jp>
Signed-off-by: Tsutomu Owa <tsutomu.owa@toshiba.co.jp>
Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
tsutomu.owa@toshiba.co.jp 2017-09-12 08:55:32 +00:00 committed by David Teigland
parent cc661fc934
commit 988419a9de
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/dlm/lowcomms.c
View File

@ -541,7 +541,7 @@ static void restore_callbacks(struct socket *sock)
} }
/* Make a socket active */ /* Make a socket active */
static void add_sock(struct socket *sock, struct connection *con, bool save_cb) static void add_sock(struct socket *sock, struct connection *con)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
@ -801,7 +801,7 @@ static int tcp_accept_from_sock(struct connection *con)
newcon->othercon = othercon; newcon->othercon = othercon;
othercon->sock = newsock; othercon->sock = newsock;
newsock->sk->sk_user_data = othercon; newsock->sk->sk_user_data = othercon;
add_sock(newsock, othercon, false); add_sock(newsock, othercon);
addcon = othercon; addcon = othercon;
} }
else { else {
@ -817,7 +817,7 @@ static int tcp_accept_from_sock(struct connection *con)
/* accept copies the sk after we've saved the callbacks, so we /* 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 don't want to save them a second time or comm errors will
result in calling sk_error_report recursively. */ result in calling sk_error_report recursively. */
add_sock(newsock, newcon, false); add_sock(newsock, newcon);
addcon = newcon; addcon = newcon;
} }
@ -918,7 +918,7 @@ static int sctp_accept_from_sock(struct connection *con)
newcon->othercon = othercon; newcon->othercon = othercon;
othercon->sock = newsock; othercon->sock = newsock;
newsock->sk->sk_user_data = othercon; newsock->sk->sk_user_data = othercon;
add_sock(newsock, othercon, false); add_sock(newsock, othercon);
addcon = othercon; addcon = othercon;
} else { } else {
printk("Extra connection from node %d attempted\n", nodeid); printk("Extra connection from node %d attempted\n", nodeid);
@ -929,7 +929,7 @@ static int sctp_accept_from_sock(struct connection *con)
} else { } else {
newsock->sk->sk_user_data = newcon; newsock->sk->sk_user_data = newcon;
newcon->rx_action = receive_from_sock; newcon->rx_action = receive_from_sock;
add_sock(newsock, newcon, false); add_sock(newsock, newcon);
addcon = newcon; addcon = newcon;
} }
@ -1057,7 +1057,7 @@ static void sctp_connect_to_sock(struct connection *con)
sock->sk->sk_user_data = con; sock->sk->sk_user_data = con;
con->rx_action = receive_from_sock; con->rx_action = receive_from_sock;
con->connect_action = sctp_connect_to_sock; con->connect_action = sctp_connect_to_sock;
add_sock(sock, con, true); add_sock(sock, con);
/* Bind to all addresses. */ /* Bind to all addresses. */
if (sctp_bind_addrs(con, 0)) if (sctp_bind_addrs(con, 0))
@ -1142,7 +1142,7 @@ static void tcp_connect_to_sock(struct connection *con)
sock->sk->sk_user_data = con; sock->sk->sk_user_data = con;
con->rx_action = receive_from_sock; con->rx_action = receive_from_sock;
con->connect_action = tcp_connect_to_sock; con->connect_action = tcp_connect_to_sock;
add_sock(sock, con, true); add_sock(sock, con);
/* Bind to our cluster-known address connecting to avoid /* Bind to our cluster-known address connecting to avoid
routing problems */ routing problems */
@ -1361,7 +1361,7 @@ static int tcp_listen_for_all(void)
sock = tcp_create_listen_sock(con, dlm_local_addr[0]); sock = tcp_create_listen_sock(con, dlm_local_addr[0]);
if (sock) { if (sock) {
add_sock(sock, con, true); add_sock(sock, con);
result = 0; result = 0;
} }
else { else {