diff options
| author | Sowmini Varadhan <sowmini.varadhan@oracle.com> | 2017-11-30 22:11:27 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-01 23:25:15 +0300 |
| commit | 2d746c93b6e55d34a98c8983b30d991707a2059b (patch) | |
| tree | 8885dd05047a623f4148b651651fb6930b84b0f8 | |
| parent | 4c94cc2d3d57a2e843ab10887f67faa82c2337f9 (diff) | |
| download | linux-2d746c93b6e55d34a98c8983b30d991707a2059b.tar.xz | |
rds: tcp: remove redundant function rds_tcp_conn_paths_destroy()
A side-effect of Commit c14b0366813a ("rds: tcp: set linger to 1
when unloading a rds-tcp") is that we always send a RST on the tcp
connection for rds_conn_destroy(), so rds_tcp_conn_paths_destroy()
is not needed any more and is removed in this patch.
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/rds/tcp.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index 6b7ee71f40c6..222cc530e5b5 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -495,27 +495,6 @@ static struct pernet_operations rds_tcp_net_ops = { .size = sizeof(struct rds_tcp_net), }; -/* explicitly send a RST on each socket, thereby releasing any socket refcnts - * that may otherwise hold up netns deletion. - */ -static void rds_tcp_conn_paths_destroy(struct rds_connection *conn) -{ - struct rds_conn_path *cp; - struct rds_tcp_connection *tc; - int i; - struct sock *sk; - - for (i = 0; i < RDS_MPATH_WORKERS; i++) { - cp = &conn->c_path[i]; - tc = cp->cp_transport_data; - if (!tc->t_sock) - continue; - sk = tc->t_sock->sk; - sk->sk_prot->disconnect(sk, 0); - tcp_done(sk); - } -} - static void rds_tcp_kill_sock(struct net *net) { struct rds_tcp_connection *tc, *_tc; @@ -535,10 +514,8 @@ static void rds_tcp_kill_sock(struct net *net) list_move_tail(&tc->t_tcp_node, &tmp_list); } spin_unlock_irq(&rds_tcp_conn_lock); - list_for_each_entry_safe(tc, _tc, &tmp_list, t_tcp_node) { - rds_tcp_conn_paths_destroy(tc->t_cpath->cp_conn); + list_for_each_entry_safe(tc, _tc, &tmp_list, t_tcp_node) rds_conn_destroy(tc->t_cpath->cp_conn); - } } void *rds_tcp_listen_sock_def_readable(struct net *net) |