From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932520AbeA2CKG (ORCPT ); Sun, 28 Jan 2018 21:10:06 -0500 Received: from shards.monkeyblade.net ([184.105.139.130]:57122 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750771AbeA2CKF (ORCPT ); Sun, 28 Jan 2018 21:10:05 -0500 Date: Sun, 28 Jan 2018 21:09:55 -0500 (EST) Message-Id: <20180128.210955.673000738679459704.davem@davemloft.net> To: sfr@canb.auug.org.au Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, ktkhai@virtuozzo.com, ddstreet@ieee.org Subject: Re: linux-next: build failure after merge of the net-next tree From: David Miller In-Reply-To: <20180129125028.75774df6@canb.auug.org.au> References: <20180129125028.75774df6@canb.auug.org.au> X-Mailer: Mew version 6.7 on Emacs 25.3 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell Date: Mon, 29 Jan 2018 12:50:28 +1100 > I have applied the following merge fix patch for today: > > From: Stephen Rothwell > 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 > --- > 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.