openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

RDS: TCP: Remove dead logic around c_passive in rds-tcp 

The c_passive bit is only intended for the IB transport and will
never be encountered in rds-tcp, so remove the dead logic that
predicates on this bit.

Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sowmini Varadhan 2016-06-30 16:11:11 -07:00 committed by David S. Miller
parent 226f7a7d97
commit 26e4e6bb68
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/rds/tcp.c
View File

@ -329,11 +329,8 @@ static void rds_tcp_destroy_conns(void)
INIT_LIST_HEAD(&rds_tcp_conn_list); INIT_LIST_HEAD(&rds_tcp_conn_list);
spin_unlock_irq(&rds_tcp_conn_lock); spin_unlock_irq(&rds_tcp_conn_lock);
list_for_each_entry_safe(tc, _tc, &tmp_list, t_tcp_node) { list_for_each_entry_safe(tc, _tc, &tmp_list, t_tcp_node)
if (tc->conn->c_passive)
rds_conn_destroy(tc->conn->c_passive);
rds_conn_destroy(tc->conn); rds_conn_destroy(tc->conn);
}
} }
static void rds_tcp_exit(void); static void rds_tcp_exit(void);
@ -512,8 +509,6 @@ static void rds_tcp_kill_sock(struct net *net)
sk = tc->t_sock->sk; sk = tc->t_sock->sk;
sk->sk_prot->disconnect(sk, 0); sk->sk_prot->disconnect(sk, 0);
tcp_done(sk); tcp_done(sk);
if (tc->conn->c_passive)
rds_conn_destroy(tc->conn->c_passive);
rds_conn_destroy(tc->conn); rds_conn_destroy(tc->conn);
} }
} }