Revert "rds: RDS (tcp) hangs on sendto() to unresponding address"

Orabug: 28837953

This reverts commit 4d8376fac652927fcc94ca88db134ce7822c03c1.

Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/net/rds/send.c b/net/rds/send.c
index c1ca5a12e512fd13f069201f667d7902bfbc86d2..6a753aeafe913bda63df4918e4d87507aba5b3ea 100644 (file)
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -1182,8 +1182,7 @@ static inline int rds_rdma_bytes(struct msghdr *msg, size_t *rdma_bytes)
        return 0;
 }
 
-static int rds_send_mprds_hash(struct rds_sock *rs,
-                              struct rds_connection *conn, int nonblock)
+static int rds_send_mprds_hash(struct rds_sock *rs, struct rds_connection *conn)
 {
        int hash;
 
@@ -1195,11 +1194,6 @@ static int rds_send_mprds_hash(struct rds_sock *rs,
                rds_send_ping(conn, 0);
 
                if (conn->c_npaths == 0) {
-                       /* Cannot wait for the connection be made, so just use
-                        * the base c_path.
-                        */
-                       if (nonblock)
-                               return 0;
                        wait_event_interruptible(conn->c_hs_waitq,
                                                 (conn->c_npaths != 0));
                }
@@ -1392,7 +1386,7 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
        }
 
        if (conn->c_trans->t_mp_capable)
-               cpath = &conn->c_path[rds_send_mprds_hash(rs, conn, nonblock)];
+               cpath = &conn->c_path[rds_send_mprds_hash(rs, conn)];
        else
                cpath = &conn->c_path[0];