| Message ID | 20160617201212.GC29044@oracle.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 6/17/2016 1:12 PM, Sowmini Varadhan wrote: > 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>
From: Sowmini Varadhan <sowmini.varadhan@oracle.com> Date: Fri, 17 Jun 2016 16:12:12 -0400 > 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> Applied.
diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c index 686b1d0..245542c 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);
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> --- net/rds/tcp_listen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)