diff options
author | Sowmini Varadhan <sowmini.varadhan@oracle.com> | 2016-06-13 12:44:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-15 02:50:41 -0400 |
commit | 0cb43965d42a21a7af41f88f1021b478dc102425 (patch) | |
tree | 628e5ac505d94dd9cf1f2551737d9139eb58662f /net/rds/tcp_connect.c | |
parent | dcf1158b275f9d51d6a742cf7166edc764ee4718 (diff) |
RDS: split out connection specific state from rds_connection to rds_conn_path
In preparation for multipath RDS, split the rds_connection
structure into a base structure, and a per-path struct rds_conn_path.
The base structure tracks information and locks common to all
paths. The workqs for send/recv/shutdown etc are tracked per
rds_conn_path. Thus the workq callbacks now work with rds_conn_path.
This commit allows for one rds_conn_path per rds_connection, and will
be extended into multiple conn_paths in subsequent commits.
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/tcp_connect.c')
-rw-r--r-- | net/rds/tcp_connect.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c index fba13d0305fb..ba9ec67f4e41 100644 --- a/net/rds/tcp_connect.c +++ b/net/rds/tcp_connect.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <linux/in.h> | 34 | #include <linux/in.h> |
35 | #include <net/tcp.h> | 35 | #include <net/tcp.h> |
36 | 36 | ||
37 | #include "rds_single_path.h" | ||
37 | #include "rds.h" | 38 | #include "rds.h" |
38 | #include "tcp.h" | 39 | #include "tcp.h" |
39 | 40 | ||
@@ -60,7 +61,8 @@ void rds_tcp_state_change(struct sock *sk) | |||
60 | case TCP_SYN_RECV: | 61 | case TCP_SYN_RECV: |
61 | break; | 62 | break; |
62 | case TCP_ESTABLISHED: | 63 | case TCP_ESTABLISHED: |
63 | rds_connect_path_complete(conn, RDS_CONN_CONNECTING); | 64 | rds_connect_path_complete(&conn->c_path[0], |
65 | RDS_CONN_CONNECTING); | ||
64 | break; | 66 | break; |
65 | case TCP_CLOSE_WAIT: | 67 | case TCP_CLOSE_WAIT: |
66 | case TCP_CLOSE: | 68 | case TCP_CLOSE: |