| Message ID | 20171207132636.259066-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 96307a0a75d8f1847debefd6a402339aac43e224 |
| Headers | show |
| Series | netfilter: fix clusterip_net_exit build regression | expand |
thank you, it was mu fault. Reviewed-by: Vasily Averin <vvs@virtuozzo.com> 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 <arnd@arndb.de> > --- > 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 >
On Thu, Dec 07, 2017 at 02:26:09PM +0100, 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(). Applied, thanks Arnd.
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
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 <arnd@arndb.de> --- net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0