From ef8e8ab3eb01132f5d9f91407dd57242b5c463e3 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 15 Sep 2006 16:31:56 -0400
Subject: [PATCH] --- yaml --- r: 34815 b: refs/heads/master c:
 51b6ded4d9a94a61035deba1d8f51a54e3a3dd86 h: refs/heads/master i:   34813:
 87b92fe254508d6b674544711000646f1a8159d0   34811:
 1d3c3373ae7aadf84de45215d5dff2296da7ea68   34807:
 0395c70c2e0a47af92d2bcf9deee84d4ab5db43e   34799:
 b2e303820f0b0154e834b9d0bfe319fd5869a6f1   34783:
 ca17bd7c32f50c7c57431b8971211d181dc5826b   34751:
 e3ae956b8153a8bdcb9dbbe9357ef966258d9099   34687:
 8d4673683e123f7de7eeb28cc288c71c615bbb43   34559:
 e8c2e9dbd4e893fd0f9ec1d95def53dc22e827bc   34303:
 07eaf9d629c4a14e96fad32bca893228e0c2ddd2   33791:
 fc715c03a9bf09817e24de4d4c6a2c961d480a29   32767:
 5ae4f0356026b0363efef5eff8fdbdc7fb85add4 v: v3

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

diff --git a/[refs] b/[refs]
index e130125240ec..6c013815da9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2066fe89b459c3c787c811b3369df191cddd93d8
+refs/heads/master: 51b6ded4d9a94a61035deba1d8f51a54e3a3dd86
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 665949d27798..b99113b0f65f 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -833,6 +833,9 @@ static int nfs4_get_sb(struct file_system_type *fs_type,
 				__FUNCTION__);
 		return -EINVAL;
 	}
+	/* RFC3530: The default port for NFS is 2049 */
+	if (addr.sin_port == 0)
+		addr.sin_port = NFS_PORT;
 
 	/* Grab the authentication type */
 	authflavour = RPC_AUTH_UNIX;