From: Brian Maly <brian.maly@oracle.com>
Date: Wed, 24 Oct 2018 16:38:03 +0000 (-0400)
Subject: Revert "rds: RDS (tcp) hangs on sendto() to unresponding address"
X-Git-Tag: v4.1.12-124.31.3~459
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d55a94ea782cd84a1096580d19b009414f58d3df;p=users%2Fjedix%2Flinux-maple.git

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 c1ca5a12e512..6a753aeafe91 100644
--- 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];