diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-09-04 11:05:07 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 09:47:38 -0700 |
| commit | d351ebe91e308cebfefc6808fd96a53c9d8f0c7b (patch) | |
| tree | 62e5238118eb737af23dd9c695f73718e3807097 | |
| parent | 839e17b7fb531eec48714abf5962b0a1310f71d9 (diff) | |
| download | kernel_samsung_smdk4412-d351ebe91e308cebfefc6808fd96a53c9d8f0c7b.zip kernel_samsung_smdk4412-d351ebe91e308cebfefc6808fd96a53c9d8f0c7b.tar.gz kernel_samsung_smdk4412-d351ebe91e308cebfefc6808fd96a53c9d8f0c7b.tar.bz2 | |
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 <tolzmann@molgen.mpg.de>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/nfs/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index d709112..a1f3d6e 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1815,6 +1815,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; @@ -2528,6 +2529,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) |