From c2704ad96c2737a055999ef0815cae638e79e18c Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 4 Sep 2012 11:05:07 -0400 Subject: [PATCH] --- yaml --- r: 322617 b: refs/heads/master c: 872ece86ea5c367aa92f44689c2d01a1c767aeb3 h: refs/heads/master i: 322615: 4780cdc7ac70dcaadee4e37347b1b7497d9893e9 v: v3 --- [refs] | 2 +- trunk/fs/nfs/super.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9b514bfe7247..93b18200ec5b 100644 --- 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 index 239aff7338eb..b8eda700584b 100644 --- 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)