aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dlm
diff options
context:
space:
mode:
authortsutomu.owa@toshiba.co.jp <tsutomu.owa@toshiba.co.jp>2017-09-12 04:55:32 -0400
committerDavid Teigland <teigland@redhat.com>2017-09-25 13:45:21 -0400
commit988419a9deab68035364d8163bc27adb694ab28e (patch)
tree3a0300a54b4476e58a21db61e7e4bb9b88e2b1ca /fs/dlm
parentcc661fc934a004526a714a7b804ee3f119d27093 (diff)
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>
Diffstat (limited to 'fs/dlm')
-rw-r--r--fs/dlm/lowcomms.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 32b534f4a9b6..72247cb4bc5e 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -541,7 +541,7 @@ static void restore_callbacks(struct socket *sock)
541} 541}
542 542
543/* Make a socket active */ 543/* Make a socket active */
544static void add_sock(struct socket *sock, struct connection *con, bool save_cb) 544static void add_sock(struct socket *sock, struct connection *con)
545{ 545{
546 struct sock *sk = sock->sk; 546 struct sock *sk = sock->sk;
547 547
@@ -801,7 +801,7 @@ static int tcp_accept_from_sock(struct connection *con)
801 newcon->othercon = othercon; 801 newcon->othercon = othercon;
802 othercon->sock = newsock; 802 othercon->sock = newsock;
803 newsock->sk->sk_user_data = othercon; 803 newsock->sk->sk_user_data = othercon;
804 add_sock(newsock, othercon, false); 804 add_sock(newsock, othercon);
805 addcon = othercon; 805 addcon = othercon;
806 } 806 }
807 else { 807 else {
@@ -817,7 +817,7 @@ static int tcp_accept_from_sock(struct connection *con)
817 /* accept copies the sk after we've saved the callbacks, so we 817 /* accept copies the sk after we've saved the callbacks, so we
818 don't want to save them a second time or comm errors will 818 don't want to save them a second time or comm errors will
819 result in calling sk_error_report recursively. */ 819 result in calling sk_error_report recursively. */
820 add_sock(newsock, newcon, false); 820 add_sock(newsock, newcon);
821 addcon = newcon; 821 addcon = newcon;
822 } 822 }
823 823
@@ -918,7 +918,7 @@ static int sctp_accept_from_sock(struct connection *con)
918 newcon->othercon = othercon; 918 newcon->othercon = othercon;
919 othercon->sock = newsock; 919 othercon->sock = newsock;
920 newsock->sk->sk_user_data = othercon; 920 newsock->sk->sk_user_data = othercon;
921 add_sock(newsock, othercon, false); 921 add_sock(newsock, othercon);
922 addcon = othercon; 922 addcon = othercon;
923 } else { 923 } else {
924 printk("Extra connection from node %d attempted\n", nodeid); 924 printk("Extra connection from node %d attempted\n", nodeid);
@@ -929,7 +929,7 @@ static int sctp_accept_from_sock(struct connection *con)
929 } else { 929 } else {
930 newsock->sk->sk_user_data = newcon; 930 newsock->sk->sk_user_data = newcon;
931 newcon->rx_action = receive_from_sock; 931 newcon->rx_action = receive_from_sock;
932 add_sock(newsock, newcon, false); 932 add_sock(newsock, newcon);
933 addcon = newcon; 933 addcon = newcon;
934 } 934 }
935 935
@@ -1057,7 +1057,7 @@ static void sctp_connect_to_sock(struct connection *con)
1057 sock->sk->sk_user_data = con; 1057 sock->sk->sk_user_data = con;
1058 con->rx_action = receive_from_sock; 1058 con->rx_action = receive_from_sock;
1059 con->connect_action = sctp_connect_to_sock; 1059 con->connect_action = sctp_connect_to_sock;
1060 add_sock(sock, con, true); 1060 add_sock(sock, con);
1061 1061
1062 /* Bind to all addresses. */ 1062 /* Bind to all addresses. */
1063 if (sctp_bind_addrs(con, 0)) 1063 if (sctp_bind_addrs(con, 0))
@@ -1142,7 +1142,7 @@ static void tcp_connect_to_sock(struct connection *con)
1142 sock->sk->sk_user_data = con; 1142 sock->sk->sk_user_data = con;
1143 con->rx_action = receive_from_sock; 1143 con->rx_action = receive_from_sock;
1144 con->connect_action = tcp_connect_to_sock; 1144 con->connect_action = tcp_connect_to_sock;
1145 add_sock(sock, con, true); 1145 add_sock(sock, con);
1146 1146
1147 /* Bind to our cluster-known address connecting to avoid 1147 /* Bind to our cluster-known address connecting to avoid
1148 routing problems */ 1148 routing problems */
@@ -1361,7 +1361,7 @@ static int tcp_listen_for_all(void)
1361 1361
1362 sock = tcp_create_listen_sock(con, dlm_local_addr[0]); 1362 sock = tcp_create_listen_sock(con, dlm_local_addr[0]);
1363 if (sock) { 1363 if (sock) {
1364 add_sock(sock, con, true); 1364 add_sock(sock, con);
1365 result = 0; 1365 result = 0;
1366 } 1366 }
1367 else { 1367 else {