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 <sowmini.varadhan@oracle.com>
Tested-by: Imanti Mendez <imanti.mendez@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/rds/connection.c b/net/rds/connection.c
index 35714ce80680bc76b7f7d69b984adb24a0ec850b..97639fb0d5ee17328477f33a5f3d6e7666a822ec 100644 (file)
--- 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 c0678c72671927ff7890a5d3f4e738f0e91333a2..acb0efaae371148c822e3178618e2bd760cbce0d 100644 (file)
--- 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 d2f04abe7d59d9e51547578f232cb3be03099b3e..ead79debd205e4f1b13ab286ac57e574ad00d80a 100644 (file)
--- 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 45e5ae157a08621807e9952740686fe581633626..f78a83af6509a15600ca14c7f18f7ae86a2314fd 100644 (file)
--- 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 {