---

yaml --- r: 322617 b: refs/heads/master c: 872ece8 h: refs/heads/master i: 322615: 4780cdc v: v3
git-mirror · Sep 4, 2012 · c2704ad · c2704ad
1 parent b805cb6
commit c2704ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3f52af3e03013db5237e339c817beaae5ec9e3a
+refs/heads/master: 872ece86ea5c367aa92f44689c2d01a1c767aeb3
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
@@ -1867,6 +1867,7 @@ static int nfs23_validate_mount_data(void *options,
 
 		memcpy(sap, &data->addr, sizeof(data->addr));
 		args->nfs_server.addrlen = sizeof(data->addr);
+		args->nfs_server.port = ntohs(data->addr.sin_port);
 		if (!nfs_verify_server_address(sap))
 			goto out_no_address;
 
@@ -2564,6 +2565,7 @@ static int nfs4_validate_mount_data(void *options,
 			return -EFAULT;
 		if (!nfs_verify_server_address(sap))
 			goto out_no_address;
+		args->nfs_server.port = ntohs(((struct sockaddr_in *)sap)->sin_port);
 
 		if (data->auth_flavourlen) {
 			if (data->auth_flavourlen > 1)