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)