From: Chuck Lever <chuck.lever@oracle.com>
Date: Sat, 28 Jul 2007 21:50:19 +0000 (-0400)
Subject: mount.nfs: fix hang when getport() uses TCP against unavailable servers
X-Git-Tag: nfs-utils-1-1-1~119
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=897f581874255d363e00ef94534f6fced8dd2ba2;p=nfs-utils.git

mount.nfs: fix hang when getport() uses TCP against unavailable servers

If get_socket() can't get us an open TCP socket, we know the server is
down, so make  getport() exit early instead of hanging.  This logic is
copied from clnt_ping().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
---

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 21cf4ef..5653302 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -135,8 +135,23 @@ unsigned short getport(struct sockaddr_in *saddr, unsigned long prog,
 	struct pmap parms;
 	enum clnt_stat stat;
 
-	saddr->sin_port = htons (PMAPPORT);
-	socket = get_socket(saddr, prot, FALSE, FALSE);
+	saddr->sin_port = htons(PMAPPORT);
+
+	/*
+	 * Try to get a socket with a non-privileged port.
+	 * clnt*create() will create one anyway if this
+	 * fails.
+	 */
+	socket = get_socket(saddr, proto, FALSE, FALSE);
+	if (socket == RPC_ANYSOCK) {
+		if (proto == IPPROTO_TCP && errno == ETIMEDOUT) {
+			/*
+			 * TCP SYN timed out, so exit now.
+			 */
+			rpc_createerr.cf_stat = RPC_TIMEDOUT;
+		}
+		return 0;
+	}
 
 	switch (prot) {
 	case IPPROTO_UDP: