Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754258Ab1DFA5r (ORCPT ); Tue, 5 Apr 2011 20:57:47 -0400 Received: from shutemov.name ([188.40.19.243]:52517 "EHLO shutemov.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752639Ab1DFA5o (ORCPT ); Tue, 5 Apr 2011 20:57:44 -0400 Date: Wed, 6 Apr 2011 03:57:43 +0300 From: "Kirill A. Shutemov" To: Rob Landley Cc: linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, containers@lists.linux-foundation.org, Trond Myklebust , Tim Spriggs , Kir Kolyshkin , Pavel Emelyanov Subject: Re: [PATCH 2/3] Supply network namespace to rpcbind. Message-ID: <20110406005743.GB27844@shutemov.name> References: <4D94319F.8040005@parallels.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4D94319F.8040005@parallels.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2063 Lines: 59 On Thu, Mar 31, 2011 at 02:47:43AM -0500, Rob Landley wrote: > From: Rob Landley > > The sunrpc code already has some support for network namespaces, > but rpcb_create() is still using init_net. Its arguments include > a sockaddr and a port, but not a struct net *. Add one, and > pass in the value from rpc_xprt when calling it. > > Signed-off-by: Rob Landley Acked-by: Kirill A. Shutemov BTW, it seems conflicts with my rpc_pipefs patchset. I'll rebase my patchset, if your patches will be merged first. > --- > > net/sunrpc/rpcb_clnt.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c > index c652e4c..25bb8f9 100644 > --- a/net/sunrpc/rpcb_clnt.c > +++ b/net/sunrpc/rpcb_clnt.c > @@ -223,10 +223,11 @@ out: > } > > static struct rpc_clnt *rpcb_create(char *hostname, struct sockaddr *srvaddr, > - size_t salen, int proto, u32 version) > + size_t salen, int proto, struct net *net, > + u32 version) > { > struct rpc_create_args args = { > - .net = &init_net, > + .net = net, > .protocol = proto, > .address = srvaddr, > .addrsize = salen, > @@ -591,7 +592,7 @@ void rpcb_getport_async(struct rpc_task *task) > task->tk_pid, __func__, bind_version); > > rpcb_clnt = rpcb_create(clnt->cl_server, sap, salen, xprt->prot, > - bind_version); > + xprt->xprt_net, bind_version); > if (IS_ERR(rpcb_clnt)) { > status = PTR_ERR(rpcb_clnt); > dprintk("RPC: %5u %s: rpcb_create failed, error %ld\n", > _______________________________________________ > Containers mailing list > Containers@lists.linux-foundation.org > https://lists.linux-foundation.org/mailman/listinfo/containers -- Kirill A. Shutemov -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/