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

David Miller
2018-01-29T02:10:06Z

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 29 Jan 2018 12:50:28 +1100

> I have applied the following merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 29 Jan 2018 12:34:37 +1100
> Subject: [PATCH] net: fixup for "net: tcp: close sock if net namespace is exiting"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> include/net/net_namespace.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
> index 235105afa5e1..f306b2aa15a4 100644
> --- a/include/net/net_namespace.h
> +++ b/include/net/net_namespace.h
> @@ -225,7 +225,7 @@ int net_eq(const struct net *net1, const struct net *net2)
>
> static inline int check_net(const struct net *net)
> {
> - return atomic_read(&net->count) != 0;
> + return refcount_read(&net->count) != 0;
> }
>
> void net_drop_ns(void *);

Yep, this is perfect.