lkml.org 
[lkml]   [2017]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] netfilter: fix clusterip_net_exit build regression
    Date
    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
    --
    2.9.0
    \
     
     \ /
      Last update: 2017-12-07 14:28    [W:3.103 / U:0.016 seconds]
    ©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site