From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Aring Date: Mon, 19 Oct 2020 14:59:15 -0400 Subject: [Cluster-devel] [PATCH dlm/next 8/9] fs: dlm: refactor sctp sock parameter In-Reply-To: <20201019185916.707827-1-aahringo@redhat.com> References: <20201019185916.707827-1-aahringo@redhat.com> Message-ID: <20201019185916.707827-9-aahringo@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit This patch refactors sctp_bind_addrs() to work with a socket parameter instead of a connection parameter. Signed-off-by: Alexander Aring --- fs/dlm/lowcomms.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index bae4125c22deb..f18d40ba42f97 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -947,7 +947,7 @@ static void writequeue_entry_complete(struct writequeue_entry *e, int completed) /* * sctp_bind_addrs - bind a SCTP socket to all our addresses */ -static int sctp_bind_addrs(struct connection *con, uint16_t port) +static int sctp_bind_addrs(struct socket *sock, uint16_t port) { struct sockaddr_storage localaddr; struct sockaddr *addr = (struct sockaddr *)&localaddr; @@ -958,9 +958,9 @@ static int sctp_bind_addrs(struct connection *con, uint16_t port) make_sockaddr(&localaddr, port, &addr_len); if (!i) - result = kernel_bind(con->sock, addr, addr_len); + result = kernel_bind(sock, addr, addr_len); else - result = sock_bind_add(con->sock->sk, addr, addr_len); + result = sock_bind_add(sock->sk, addr, addr_len); if (result < 0) { log_print("Can't bind to %d addr number %d, %d.\n", @@ -1021,7 +1021,7 @@ static void sctp_connect_to_sock(struct connection *con) add_sock(sock, con); /* Bind to all addresses. */ - if (sctp_bind_addrs(con, 0)) + if (sctp_bind_addrs(con->sock, 0)) goto bind_err; make_sockaddr(&daddr, dlm_config.ci_tcp_port, &addr_len); @@ -1287,7 +1287,7 @@ static int sctp_listen_for_all(void) write_unlock_bh(&sock->sk->sk_callback_lock); /* Bind to all addresses. */ - if (sctp_bind_addrs(con, dlm_config.ci_tcp_port)) + if (sctp_bind_addrs(con->sock, dlm_config.ci_tcp_port)) goto create_delsock; result = sock->ops->listen(sock, 5); -- 2.26.2