From: Trond Myklebust Date: Tue, 4 Sep 2012 15:05:07 +0000 (-0400) Subject: NFS: Fix a problem with the legacy binary mount code X-Git-Tag: v3.4.12~99 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3672dff93b8c5c7d2ebaf18eb32c98b06e942dac;p=platform%2Fkernel%2Flinux-stable.git NFS: Fix a problem with the legacy binary mount code commit 872ece86ea5c367aa92f44689c2d01a1c767aeb3 upstream. Apparently, am-utils is still using the legacy binary mountdata interface, and is having trouble parsing /proc/mounts due to the 'port=' field being incorrectly set. The following patch should fix up the regression. Reported-by: Marius Tolzmann Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 7b55f51..5976e24 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1886,6 +1886,7 @@ static int nfs_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; @@ -2598,6 +2599,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)