summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-01-26 15:11:57 +0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-02-06 18:48:04 -0500
commitb48e127884b117b429d3473577b9dc3f2b42b8eb (patch)
treedcb056246ebad346e08c38806471a475edf6694e /fs
parentc7add9a9720ff5be4715f7a0bb0d9578b2e8534e (diff)
downloadlinux-stable-b48e127884b117b429d3473577b9dc3f2b42b8eb.tar.gz
linux-stable-b48e127884b117b429d3473577b9dc3f2b42b8eb.tar.bz2
linux-stable-b48e127884b117b429d3473577b9dc3f2b42b8eb.zip
NFS: pass current net to rpc_pton() while parsing mount options
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/super.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 8e210b2c16d7..94667848af9a 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1408,7 +1408,7 @@ static int nfs_parse_mount_options(char *raw,
if (string == NULL)
goto out_nomem;
mnt->nfs_server.addrlen =
- rpc_pton(&init_net, string, strlen(string),
+ rpc_pton(mnt->net, string, strlen(string),
(struct sockaddr *)
&mnt->nfs_server.address,
sizeof(mnt->nfs_server.address));
@@ -1430,7 +1430,7 @@ static int nfs_parse_mount_options(char *raw,
if (string == NULL)
goto out_nomem;
mnt->mount_server.addrlen =
- rpc_pton(&init_net, string, strlen(string),
+ rpc_pton(mnt->net, string, strlen(string),
(struct sockaddr *)
&mnt->mount_server.address,
sizeof(mnt->mount_server.address));