Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753209AbdLGQbi (ORCPT ); Thu, 7 Dec 2017 11:31:38 -0500 Received: from [195.214.232.25] ([195.214.232.25]:33365 "EHLO relay.sw.ru" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752232AbdLGQbg (ORCPT ); Thu, 7 Dec 2017 11:31:36 -0500 Subject: Re: [PATCH] netfilter: fix clusterip_net_exit build regression To: Arnd Bergmann , Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI Cc: Xin Long , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org References: <20171207132636.259066-1-arnd@arndb.de> From: Vasily Averin Message-ID: <9b5dc366-0bbc-d9f2-ae11-75ed7be6afd6@virtuozzo.com> Date: Thu, 7 Dec 2017 19:29:47 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20171207132636.259066-1-arnd@arndb.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1219 Lines: 36 thank you, it was mu fault. Reviewed-by: Vasily Averin On 2017-12-07 16:26, Arnd Bergmann wrote: > The added check produces a build error when CONFIG_PROC_FS is > disabled: > > net/ipv4/netfilter/ipt_CLUSTERIP.c: In function 'clusterip_net_exit': > net/ipv4/netfilter/ipt_CLUSTERIP.c:822:28: error: 'cn' undeclared (first use in this function) > > This moves the variable declaration out of the #ifdef to make it > available to the WARN_ON_ONCE(). > > Fixes: 613d0776d3fe ("netfilter: exit_net cleanup check added") > Signed-off-by: Arnd Bergmann > --- > net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c > index e35b8d074f06..69060e3abe85 100644 > --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c > +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c > @@ -813,8 +813,8 @@ static int clusterip_net_init(struct net *net) > > static void clusterip_net_exit(struct net *net) > { > -#ifdef CONFIG_PROC_FS > struct clusterip_net *cn = net_generic(net, clusterip_net_id); > +#ifdef CONFIG_PROC_FS > proc_remove(cn->procdir); > cn->procdir = NULL; > #endif >