From 7009719e51e2fbe99d36bdf08268f0281b83d1d9 Mon Sep 17 00:00:00 2001 From: Stanislav Kinsbursky Date: Thu, 26 Jan 2012 15:12:05 +0400 Subject: [PATCH] --- yaml --- r: 294461 b: refs/heads/master c: 33faaa380e9ec4b93503cae8c9969fb599f0f283 h: refs/heads/master i: 294459: d3dc90ac2a57072c3dcaf009156df9f850921dae v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4namespace.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3797981cf2d7..33bd0e741b3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b48e127884b117b429d3473577b9dc3f2b42b8eb +refs/heads/master: 33faaa380e9ec4b93503cae8c9969fb599f0f283 diff --git a/trunk/fs/nfs/nfs4namespace.c b/trunk/fs/nfs/nfs4namespace.c index 48a9acdbaeb6..667ea7406fd3 100644 --- a/trunk/fs/nfs/nfs4namespace.c +++ b/trunk/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; }