aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-01-26 15:12:05 +0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-02-06 18:48:05 -0500
commit33faaa380e9ec4b93503cae8c9969fb599f0f283 (patch)
tree101b6a5994840c95be7df8eeaf42c748bbe2b987
parentNFS: pass current net to rpc_pton() while parsing mount options (diff)
downloadlinux-dev-33faaa380e9ec4b93503cae8c9969fb599f0f283.tar.xz
linux-dev-33faaa380e9ec4b93503cae8c9969fb599f0f283.zip
NFS: pass transport net to rpc_pton() while parse server name
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4namespace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index 48a9acdbaeb6..667ea7406fd3 100644
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -97,11 +97,11 @@ static size_t nfs_parse_server_name(char *string, size_t len,
struct sockaddr *sa, size_t salen, struct nfs_server *server)
{
ssize_t ret;
+ struct net *net = server->client->cl_xprt->xprt_net;
- ret = rpc_pton(&init_net, string, len, sa, salen);
+ ret = rpc_pton(net, string, len, sa, salen);
if (ret == 0) {
- ret = nfs_dns_resolve_name(server->client->cl_xprt->xprt_net,
- string, len, sa, salen);
+ ret = nfs_dns_resolve_name(net, string, len, sa, salen);
if (ret < 0)
ret = 0;
}