diff options
| author | Sowmini Varadhan | 2016-07-01 01:11:12 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-07-01 22:45:17 +0200 |
| commit | 02105b2ccdd6344146e0296172a9e0f17ff624ef (patch) | |
| tree | 3be5ec1d994b348826c1cd0bf20f85441028fd39 /net/rds/tcp_listen.c | |
| parent | RDS: TCP: Remove dead logic around c_passive in rds-tcp (diff) | |
| download | kernel-qcow2-linux-02105b2ccdd6344146e0296172a9e0f17ff624ef.tar.gz kernel-qcow2-linux-02105b2ccdd6344146e0296172a9e0f17ff624ef.tar.xz kernel-qcow2-linux-02105b2ccdd6344146e0296172a9e0f17ff624ef.zip | |
RDS: TCP: Make rds_tcp_connection track the rds_conn_path
The struct rds_tcp_connection is the transport-specific private
data structure that tracks TCP information per rds_conn_path.
Modify this structure to have a back-pointer to the rds_conn_path
for which it is the ->cp_transport_data.
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>
Diffstat (limited to 'net/rds/tcp_listen.c')
| -rw-r--r-- | net/rds/tcp_listen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c index f9cc945a77b3..d8933469ab13 100644 --- a/net/rds/tcp_listen.c +++ b/net/rds/tcp_listen.c @@ -121,7 +121,7 @@ int rds_tcp_accept_one(struct socket *sock) */ rs_tcp = (struct rds_tcp_connection *)conn->c_transport_data; rds_conn_transition(conn, RDS_CONN_DOWN, RDS_CONN_CONNECTING); - mutex_lock(&rs_tcp->t_conn_lock); + mutex_lock(&rs_tcp->t_conn_path_lock); conn_state = rds_conn_state(conn); if (conn_state != RDS_CONN_CONNECTING && conn_state != RDS_CONN_UP) goto rst_nsk; @@ -156,7 +156,7 @@ rst_nsk: ret = 0; out: if (rs_tcp) - mutex_unlock(&rs_tcp->t_conn_lock); + mutex_unlock(&rs_tcp->t_conn_path_lock); if (new_sock) sock_release(new_sock); return ret; |