diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-09-04 11:05:07 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-09-19 15:05:07 +0100 |
| commit | 94757f8d13027373fc9e930b8b7258792a3dbe6b (patch) | |
| tree | d4ec8a8536a4e066efd2d15641bccd80414226ed /fs/nfs | |
| parent | ad1a5fb246644fd0300de5adc8b1f4f221e631a8 (diff) | |
| download | kernel_samsung_smdk4412-94757f8d13027373fc9e930b8b7258792a3dbe6b.zip kernel_samsung_smdk4412-94757f8d13027373fc9e930b8b7258792a3dbe6b.tar.gz kernel_samsung_smdk4412-94757f8d13027373fc9e930b8b7258792a3dbe6b.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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/nfs')
| -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 6e85ec6..e42d6f6 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1820,6 +1820,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; @@ -2538,6 +2539,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) |