From e3f9c6a466ca46f03ff08543247112b8136137c6 Mon Sep 17 00:00:00 2001 From: Stanislav Kinsbursky Date: Fri, 13 Jan 2012 14:02:40 +0400 Subject: [PATCH] --- yaml --- r: 294415 b: refs/heads/master c: b030fb0bb113316cc6f56779388b8572ab0699da h: refs/heads/master i: 294413: 25cceb9b6e4d6dc61bb5cf1594fe6f625d8d241c 294411: b2999d43bd907f085eddb7473d7db3c5f40174eb 294407: 34011df5502614b8efc8b9183e2aa60072b22129 294399: 54cbdc9ad2d57e0f084ff0f743c7bed0082cbd45 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/rpcb_clnt.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0fb3efb3b3a1..0cb00051a0ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2ac4dc911fdbc9b98a6a48b40efc45aa9161775 +refs/heads/master: b030fb0bb113316cc6f56779388b8572ab0699da diff --git a/trunk/net/sunrpc/rpcb_clnt.c b/trunk/net/sunrpc/rpcb_clnt.c index 7c6fac004447..4ce3a8e02953 100644 --- a/trunk/net/sunrpc/rpcb_clnt.c +++ b/trunk/net/sunrpc/rpcb_clnt.c @@ -934,7 +934,8 @@ static int rpcb_dec_getaddr(struct rpc_rqst *req, struct xdr_stream *xdr, dprintk("RPC: %5u RPCB_%s reply: %s\n", task->tk_pid, task->tk_msg.rpc_proc->p_name, (char *)p); - if (rpc_uaddr2sockaddr(&init_net, (char *)p, len, sap, sizeof(address)) == 0) + if (rpc_uaddr2sockaddr(req->rq_xprt->xprt_net, (char *)p, len, + sap, sizeof(address)) == 0) goto out_fail; rpcb->r_port = rpc_get_port(sap);