Re: linux-next: build failure after merge of the nfsd tree

["J. Bruce Fields" <bfields@fieldses.org>]

On Fri, Mar 01, 2013 at 01:19:42AM +0000, Myklebust, Trond wrote:
> On Fri, 2013-03-01 at 12:04 +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the nfsd tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > net/sunrpc/xprtsock.c:1923:30: error: 'struct rpc_task' has no member named 'tk_xprt'
> > 
> > Caused by commit dc107402ae06 ("SUNRPC: make AF_LOCAL connect
> > synchronous") interacting with commit 77102893ae68 ("SUNRPC: Nuke the
> > tk_xprt macro") from Linus' tree.
> > 
> > I have no idea how to fix this, so I have used the version of the nfsd
> > tree from next-20130228 for today.
> 
> Hi Bruce,
> 
> The attached patch should suffice to fix this up.

Thanks!

Looks like Linus got this right in the upstream merge.

--b.

> 
> Cheers
>   Trond
> 
> -- 
> Trond Myklebust
> Linux NFS client maintainer
> 
> NetApp
> Trond.Myklebust@netapp.com
> www.netapp.com

> diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
> index 2e7e09c..c1d8476 100644
> --- a/net/sunrpc/xprtsock.c
> +++ b/net/sunrpc/xprtsock.c
> @@ -1918,9 +1918,8 @@ out:
>  	return status;
>  }
>  
> -static void xs_local_connect(struct rpc_task *task)
> +static void xs_local_connect(struct rpc_xprt *xprt, struct rpc_task *task)
>  {
> -	struct rpc_xprt *xprt = task->tk_xprt;
>  	struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
>  	int ret;
>