diff options
| author | Sowmini Varadhan <sowmini.varadhan@oracle.com> | 2016-06-17 16:12:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-17 22:29:54 -0700 |
| commit | 3bb549ae4c51028c1930528ae9fcd6eca0474724 (patch) | |
| tree | db24f3dc444bbed8f93fd4b0a9902dd30edabe09 /net/rds | |
| parent | a9836cbb5fc885d3b8f3b91b2d47525f7269dec1 (diff) | |
| download | linux-stable-3bb549ae4c51028c1930528ae9fcd6eca0474724.tar.gz linux-stable-3bb549ae4c51028c1930528ae9fcd6eca0474724.tar.bz2 linux-stable-3bb549ae4c51028c1930528ae9fcd6eca0474724.zip | |
RDS: TCP: rds_tcp_accept_one() should transition socket from RESETTING to UP
The state of the rds_connection after rds_tcp_reset_callbacks() would
be RDS_CONN_RESETTING and this is the value that should be passed
by rds_tcp_accept_one() to rds_connect_path_complete() to transition
the socket to RDS_CONN_UP.
Fixes: b5c21c0947c1 ("RDS: TCP: fix race windows in send-path quiescence
by rds_tcp_accept_one()")
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>
Diffstat (limited to 'net/rds')
| -rw-r--r-- | net/rds/tcp_listen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c index 686b1d03a558..245542ca4718 100644 --- a/net/rds/tcp_listen.c +++ b/net/rds/tcp_listen.c @@ -138,7 +138,7 @@ int rds_tcp_accept_one(struct socket *sock) rds_tcp_reset_callbacks(new_sock, conn); conn->c_outgoing = 0; /* rds_connect_path_complete() marks RDS_CONN_UP */ - rds_connect_path_complete(conn, RDS_CONN_DISCONNECTING); + rds_connect_path_complete(conn, RDS_CONN_RESETTING); } } else { rds_tcp_set_callbacks(new_sock, conn); |