From: Sowmini Varadhan Date: Tue, 28 Jun 2016 19:17:32 +0000 (-0700) Subject: RDS: TCP: rds_tcp_accept_one() should transition socket from RESETTING to UP X-Git-Tag: v4.1.12-92~87^2~16 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=349ff6acbceb35621e67fb734f501ff55a287f24;p=users%2Fjedix%2Flinux-maple.git RDS: TCP: rds_tcp_accept_one() should transition socket from RESETTING to UP Orabug 23542064 Backport of upstream commit 3bb549ae4c51 ("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 Acked-by: Santosh Shilimkar Signed-off-by: David S. Miller --- diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c index c3cc2a31b013..b3826efcdab4 100644 --- a/net/rds/tcp_listen.c +++ b/net/rds/tcp_listen.c @@ -137,7 +137,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);