Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41500c3e authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by David S. Miller
Browse files

rds: tcp: remove cp_outgoing 



After commit 1a0e100f ("RDS: TCP: Force every connection to be
initiated by numerically smaller IP address") we no longer need
the logic associated with cp_outgoing, so clean up usage of this
field.

Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Tested-by: default avatarImanti Mendez <imanti.mendez@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f886eef

net/rds/connection.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -124,11 +124,6 @@ static void __rds_conn_path_init(struct rds_connection *conn, 
	cp->cp_conn = conn;

	cp->cp_conn = conn;

	atomic_set(&cp->cp_state, RDS_CONN_DOWN);

	atomic_set(&cp->cp_state, RDS_CONN_DOWN);

	cp->cp_send_gen = 0;

	cp->cp_send_gen = 0;

	/* cp_outgoing is per-path. So we can only set it here

	 * for the single-path transports.

	 */

	if (!conn->c_trans->t_mp_capable)

		cp->cp_outgoing = (is_outgoing ? 1 : 0);

	cp->cp_reconnect_jiffies = 0;

	cp->cp_reconnect_jiffies = 0;

	INIT_DELAYED_WORK(&cp->cp_send_w, rds_send_worker);

	INIT_DELAYED_WORK(&cp->cp_send_w, rds_send_worker);

	INIT_DELAYED_WORK(&cp->cp_recv_w, rds_recv_worker);

	INIT_DELAYED_WORK(&cp->cp_recv_w, rds_recv_worker);

net/rds/rds.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -125,8 +125,6 @@ struct rds_conn_path { 




	unsigned int		cp_unacked_packets;

	unsigned int		cp_unacked_packets;

	unsigned int		cp_unacked_bytes;

	unsigned int		cp_unacked_bytes;

	unsigned int		cp_outgoing:1,

				cp_pad_to_32:31;

	unsigned int		cp_index;

	unsigned int		cp_index;

};

};

net/rds/tcp_connect.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -135,7 +135,6 @@ int rds_tcp_conn_path_connect(struct rds_conn_path *cp) 
	ret = sock->ops->connect(sock, (struct sockaddr *)&dest, sizeof(dest),

	ret = sock->ops->connect(sock, (struct sockaddr *)&dest, sizeof(dest),

				 O_NONBLOCK);

				 O_NONBLOCK);





	cp->cp_outgoing = 1;

	rdsdebug("connect to address %pI4 returned %d\n", &conn->c_faddr, ret);

	rdsdebug("connect to address %pI4 returned %d\n", &conn->c_faddr, ret);

	if (ret == -EINPROGRESS)

	if (ret == -EINPROGRESS)

		ret = 0;

		ret = 0;

net/rds/tcp_listen.c

+4 −15
Original line number Original line Diff line number Diff line
@@ -171,21 +171,10 @@ int rds_tcp_accept_one(struct socket *sock) 
	if (conn_state != RDS_CONN_CONNECTING && conn_state != RDS_CONN_ERROR)

	if (conn_state != RDS_CONN_CONNECTING && conn_state != RDS_CONN_ERROR)

		goto rst_nsk;

		goto rst_nsk;

	if (rs_tcp->t_sock) {

	if (rs_tcp->t_sock) {

		/* Need to resolve a duelling SYN between peers.

		/* Duelling SYN has been handled in rds_tcp_accept_one() */

		 * We have an outstanding SYN to this peer, which may

		 * potentially have transitioned to the RDS_CONN_UP state,

		 * so we must quiesce any send threads before resetting

		 * c_transport_data.

		 */

		if (ntohl(inet->inet_saddr) < ntohl(inet->inet_daddr) ||

		    !cp->cp_outgoing) {

			goto rst_nsk;

		} else {

		rds_tcp_reset_callbacks(new_sock, cp);

		rds_tcp_reset_callbacks(new_sock, cp);

			cp->cp_outgoing = 0;

		/* rds_connect_path_complete() marks RDS_CONN_UP */

		/* rds_connect_path_complete() marks RDS_CONN_UP */

		rds_connect_path_complete(cp, RDS_CONN_RESETTING);

		rds_connect_path_complete(cp, RDS_CONN_RESETTING);

		}

	} else {

	} else {

		rds_tcp_set_callbacks(new_sock, cp);

		rds_tcp_set_callbacks(new_sock, cp);

		rds_connect_path_complete(cp, RDS_CONN_CONNECTING);

		rds_connect_path_complete(cp, RDS_CONN_CONNECTING);