Commit 3bb549ae authored Jun 17, 2016 by Sowmini Varadhan Committed by David S. Miller Jun 17, 2016

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>

parent a9836cbb

net/rds/tcp_listen.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message