From 567226b02a59281a675795e939182c12f16b68e8 Mon Sep 17 00:00:00 2001 From: Sowmini Varadhan Date: Fri, 16 Jun 2017 12:17:05 -0700 Subject: [PATCH] rds: tcp: remove cp_outgoing After commit 1a0e100fb2c9 ("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. Orabug: 26289770 (Cherry-pick of upstream commit 41500c3e2a19ffcf40a7158fce1774de08e26ba2) Signed-off-by: Sowmini Varadhan Tested-by: Imanti Mendez Acked-by: Santosh Shilimkar Signed-off-by: David S. Miller --- net/rds/connection.c | 5 ----- net/rds/rds.h | 2 -- net/rds/tcp_connect.c | 1 - net/rds/tcp_listen.c | 1 - 4 files changed, 9 deletions(-) diff --git a/net/rds/connection.c b/net/rds/connection.c index 35714ce80680..97639fb0d5ee 100644 --- a/net/rds/connection.c +++ b/net/rds/connection.c @@ -146,11 +146,6 @@ static void __rds_conn_path_init(struct rds_connection *conn, cp->cp_conn = conn; atomic_set(&cp->cp_state, RDS_CONN_DOWN); 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_start = get_seconds(); cp->cp_reconnect_warn = 1; diff --git a/net/rds/rds.h b/net/rds/rds.h index c0678c726719..acb0efaae371 100644 --- a/net/rds/rds.h +++ b/net/rds/rds.h @@ -260,8 +260,6 @@ struct rds_conn_path { unsigned int cp_unacked_packets; unsigned int cp_unacked_bytes; - unsigned int cp_outgoing:1, - cp_pad_to_32:31; unsigned int cp_index; /* when was this connection started */ diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c index d2f04abe7d59..ead79debd205 100644 --- a/net/rds/tcp_connect.c +++ b/net/rds/tcp_connect.c @@ -129,7 +129,6 @@ int rds_tcp_conn_path_connect(struct rds_conn_path *cp) rds_tcp_set_callbacks(sock, cp); ret = sock->ops->connect(sock, (struct sockaddr *)&dest, sizeof(dest), O_NONBLOCK); - cp->cp_outgoing = 1; rdsdebug("connect to address %pI4 returned %d\n", &conn->c_faddr, ret); if (ret == -EINPROGRESS) ret = 0; diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c index 45e5ae157a08..f78a83af6509 100644 --- a/net/rds/tcp_listen.c +++ b/net/rds/tcp_listen.c @@ -166,7 +166,6 @@ int rds_tcp_accept_one(struct socket *sock) * rds_tcp_accept_one_path. */ rds_tcp_reset_callbacks(new_sock, cp); - cp->cp_outgoing = 0; /* rds_connect_path_complete() marks RDS_CONN_UP */ rds_connect_path_complete(cp, RDS_CONN_RESETTING); } else { -- 2.50.1