From 4942877424257cf58ffbcd0798418a378718207d Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 11 Sep 2007 18:00:58 -0400
Subject: [PATCH] --- yaml --- r: 69213 b: refs/heads/master c:
 efd8340bb19c26a43e77c92fee9283b1f5777204 h: refs/heads/master i:   69211:
 a3abb512c69a304739b2cf060a9e5a034641859d v: v3

---
 [refs]               |  2 +-
 trunk/fs/nfs/super.c | 21 +++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 8599e38536f6..7245b8cd0813 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b79dc8ced1412e7056f3969bef40a30cc75ee530
+refs/heads/master: efd8340bb19c26a43e77c92fee9283b1f5777204
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 42b8c671da35..5085f53be2fe 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -1027,15 +1027,7 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args,
 		sin = args->mount_server.address;
 	else
 		sin = args->nfs_server.address;
-	if (args->mount_server.port == 0) {
-		status = rpcb_getport_sync(&sin,
-					   args->mount_server.program,
-					   args->mount_server.version,
-					   args->mount_server.protocol);
-		if (status < 0)
-			goto out_err;
-		sin.sin_port = htons(status);
-	} else
+	if (args->mount_server.port != 0)
 		sin.sin_port = htons(args->mount_server.port);
 
 	/*
@@ -1049,14 +1041,11 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args,
 			   args->mount_server.version,
 			   args->mount_server.protocol,
 			   root_fh);
-	if (status < 0)
-		goto out_err;
-
-	return status;
+	if (status == 0)
+		return 0;
 
-out_err:
-	dfprintk(MOUNT, "NFS: unable to contact server on host "
-		 NIPQUAD_FMT "\n", NIPQUAD(sin.sin_addr.s_addr));
+	dfprintk(MOUNT, "NFS: unable to mount server " NIPQUAD_FMT
+			", error %d\n", NIPQUAD(sin.sin_addr.s_addr), status);
 	return status;
 }