From: "Myklebust, Trond" <Trond.Myklebust@netapp•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "J. Bruce Fields" <bfields@fieldses•org>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the nfsd tree
Date: Fri, 1 Mar 2013 01:19:42 +0000 [thread overview]
Message-ID: <4FA345DA4F4AE44899BD2B03EEEC2FA9286A81EB@sacexcmbx05-prd.hq.netapp.com> (raw)
In-Reply-To: <20130301120401.bcb4a3c571cb0d2b7af96a4b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 759 bytes --]
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.
Cheers
Trond
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@netapp•com
www.netapp.com
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patches_bruce.dif --]
[-- Type: text/x-patch; name="patches_bruce.dif", Size: 471 bytes --]
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;
next prev parent reply other threads:[~2013-03-01 1:19 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-01 1:04 linux-next: build failure after merge of the nfsd tree Stephen Rothwell
2013-03-01 1:19 ` Myklebust, Trond [this message]
2013-03-02 3:42 ` J. Bruce Fields
-- strict thread matches above, loose matches on Subject: below --
2026-06-03 8:24 Mark Brown
2026-06-03 12:55 ` tanze
2026-05-25 12:57 Mark Brown
2026-05-25 13:08 ` Mark Brown
2026-05-28 8:30 ` Christian Brauner
2026-05-28 8:36 ` Miklos Szeredi
2026-06-01 12:53 ` Mark Brown
2026-06-01 13:00 ` Miklos Szeredi
2020-05-08 0:47 Stephen Rothwell
2020-05-12 0:22 ` J. Bruce Fields
2018-10-05 0:01 Stephen Rothwell
2018-10-04 23:54 Stephen Rothwell
2017-08-25 0:24 Stephen Rothwell
2017-08-30 23:48 ` Stephen Rothwell
2017-08-31 15:55 ` J. Bruce Fields
2015-07-20 23:57 Stephen Rothwell
2015-07-21 5:10 ` Kinglong Mee
2014-08-19 16:38 Stephen Rothwell
2014-05-28 2:07 Stephen Rothwell
2014-05-28 18:57 ` J. Bruce Fields
2014-05-26 1:18 Stephen Rothwell
2014-05-27 21:22 ` J. Bruce Fields
2013-04-29 1:24 Stephen Rothwell
2013-04-29 14:53 ` Chuck Lever
2013-04-29 15:45 ` J. Bruce Fields
2013-04-29 16:05 ` Chuck Lever
2013-04-29 16:21 ` Trond Myklebust
2013-04-29 17:04 ` Chuck Lever
2013-04-29 17:37 ` Simo Sorce
2013-04-29 17:38 ` J. Bruce Fields
2013-04-29 17:47 ` Chuck Lever
2013-04-29 17:57 ` Simo Sorce
2013-04-29 17:59 ` J. Bruce Fields
2013-04-29 18:30 ` Chuck Lever
2013-04-29 18:57 ` J. Bruce Fields
2013-04-29 19:14 ` Chuck Lever
2013-04-29 16:29 ` Simo Sorce
2013-04-29 16:37 ` Chuck Lever
2013-04-29 16:46 ` Simo Sorce
2013-02-02 2:04 Stephen Rothwell
2013-02-02 12:57 ` J. Bruce Fields
2013-02-03 14:41 ` J. Bruce Fields
2013-02-08 5:41 ` Stanislav Kinsbursky
2013-02-08 21:19 ` J. Bruce Fields
2011-11-15 23:29 Stephen Rothwell
2011-11-16 0:14 ` J. Bruce Fields
2011-11-16 1:26 ` J. Bruce Fields
2010-09-23 1:34 Stephen Rothwell
2010-09-23 2:33 ` J. Bruce Fields
2010-09-23 2:51 ` Neil Brown
2010-09-23 4:03 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FA345DA4F4AE44899BD2B03EEEC2FA9286A81EB@sacexcmbx05-prd.hq.netapp.com \
--to=trond.myklebust@netapp$(echo .)com \
--cc=bfields@fieldses$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox