From: Trond Myklebust <Trond.Myklebust@netapp•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Stanislav Kinsbursky <skinsbursky@parallels•com>
Subject: Re: linux-next: build failure after merge of the final tree (nfs tree related)
Date: Mon, 23 Jan 2012 13:10:24 -0500 [thread overview]
Message-ID: <1327342224.2628.3.camel@lade.trondhjem.org> (raw)
In-Reply-To: <20120123135942.3e991094b91d9087d2ba81ae@canb.auug.org.au>
On Mon, 2012-01-23 at 13:59 +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:
>
> net/sunrpc/svcsock.c: In function 'svc_setup_socket':
> net/sunrpc/svcsock.c:1412:40: error: 'struct sock_common' has no member named 'skc_net'
>
> This build has CONFIG_NET_NS unset.
>
> Caused by commit eff9c3383687 ("SUNRPC: pass network namespace to service
> registering routines").
>
> I applied this (suboptimal) patch for today:
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Mon, 23 Jan 2012 13:55:01 +1100
> Subject: [PATCH] SUNRPC: fixup for namespace changes
>
> Fixes this build error when CONFIG_NET_NS is not set:
>
> net/sunrpc/svcsock.c: In function 'svc_setup_socket':
> net/sunrpc/svcsock.c:1412:40: error: 'struct sock_common' has no member named 'skc_net'
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> net/sunrpc/svcsock.c | 9 ++++++++-
> 1 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
> index e8af0c9..4d02d1a 100644
> --- a/net/sunrpc/svcsock.c
> +++ b/net/sunrpc/svcsock.c
> @@ -41,6 +41,7 @@
> #include <net/ipv6.h>
> #include <net/tcp.h>
> #include <net/tcp_states.h>
> +#include <net/net_namespace.h>
> #include <asm/uaccess.h>
> #include <asm/ioctls.h>
>
> @@ -1409,7 +1410,13 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,
>
> /* Register socket with portmapper */
> if (*errp >= 0 && pmap_register)
> - *errp = svc_register(serv, sock->sk->sk_net, inet->sk_family,
> + *errp = svc_register(serv,
> +#ifdef CONFIG_NET_NS
> + sock->sk->sk_net,
> +#else
> + &init_net,
> +#endif
> + inet->sk_family,
> inet->sk_protocol,
> ntohs(inet_sk(inet)->inet_sport));
>
> --
> 1.7.9.rc0.23.g7e521
Stanislav,
Shouldn't we just be using a 'sock_net(sock->sk)'?
Cheers
Trond
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@netapp•com
www.netapp.com
next prev parent reply other threads:[~2012-01-23 18:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-23 2:59 linux-next: build failure after merge of the final tree (nfs tree related) Stephen Rothwell
2012-01-23 18:10 ` Trond Myklebust [this message]
2012-01-24 8:38 ` Stanislav Kinsbursky
-- strict thread matches above, loose matches on Subject: below --
2013-11-18 2:20 Stephen Rothwell
2012-03-20 8:29 Stephen Rothwell
2012-03-20 13:25 ` Myklebust, Trond
2010-09-30 3:58 Stephen Rothwell
2010-09-30 13:08 ` Bryan Schumaker
2010-08-04 4:54 Stephen Rothwell
2010-08-04 12:58 ` Trond Myklebust
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=1327342224.2628.3.camel@lade.trondhjem.org \
--to=trond.myklebust@netapp$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=skinsbursky@parallels$(echo .)com \
/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