From f6628f03f2c1a609b7b08b1d5bf6467b0cc8e80d Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 26 Oct 2007 13:32:19 -0400
Subject: [PATCH] --- yaml --- r: 79610 b: refs/heads/master c:
 0eb2574121ef0ffbebe5335c66c227d1b987fa25 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/super.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e7ae9ac33c8b..4e4c833077af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28c494c5c8d425e15b7b82571e4df6d6bc34594d
+refs/heads/master: 0eb2574121ef0ffbebe5335c66c227d1b987fa25
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index fda1635dd133..7d84d94fa827 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -1643,6 +1643,8 @@ static int nfs4_validate_mount_data(void *options,
 		if (nfs_parse_mount_options((char *)options, args) == 0)
 			return -EINVAL;
 
+		if (args->nfs_server.address.sin_port == 0)
+			args->nfs_server.address.sin_port = htons(NFS_PORT);
 		if (!nfs_verify_server_address((struct sockaddr *)
 						&args->nfs_server.address))
 			return -EINVAL;