From patchwork Thu Dec 7 13:26:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 120971 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp8355277qgn; Thu, 7 Dec 2017 05:27:16 -0800 (PST) X-Google-Smtp-Source: AGs4zMaLx1/Fy7kbf0+M5zK8m9umn9VJv21wxTf51kUijFFjJ9DEIVEbE4SI9pRN3Lb6Yrcj8pLw X-Received: by 10.99.54.130 with SMTP id d124mr24793015pga.108.1512653236514; Thu, 07 Dec 2017 05:27:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512653236; cv=none; d=google.com; s=arc-20160816; b=xYaloloLvvSUW2znPGIQBuMgmpoatzbbP6mbzzrL22fvCBQA9d79Ne9RnrDNneiCO+ ZvhTddYfUrLcwlw1h/+0vXBGkNaAvaATGIqWtQc4z4alY0k2szvMukkC8poRSVVLOnwD QoC8brHuRRl45v7fYxJvsrLUX3lF7mySKrqAh/oc/erD4CfhnnfUq4f1G0ibmHE+THU5 2XaLETOiwEQsfKRXkKHshp2Y4+PqC8X75ORrP9GoRhFXCv0rklGG3JLx2kMx0QRjDNWV uJpJhqhD097c5RM156zkhOwC2XEAkSkM+sYlO33VQ4jsalpMoNIPJ8aQ0KYiy2rR+SHc zr7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=rdQhIDFPW7zmPL6D85Q67ydmNxxdTWgT+xDifm9AHK4=; b=EKjcDLed+QfnqPJOUSQQvj2zyknG7R+15JjZlvz0g4E0IOPIDtWBXPbAAgPsuf+2Sd d60wz4LqQw1K+06LucgWVunLBBK63jyQIeD6FLpdoV4tbt0+Wph6gXkTglyHsw7iCleY TnhMUMlgyq1GbJGrgiXJHH2bUUN50j+UrEvz87nn9bH50rTXPdmnQmnbodXbY30fJrS0 w/qcl+9SxHCHFuGDZCfggkRxyo1+npYOapPszG85inbbojWCNu0KCQ/tde7Jy3ODy0R2 gEGAYuBNZrzKAFukEDHwqLDSbrZkvseEM0fBAmLZ6HRXXVqirG82F0fQCR1DKL72+Htx shwg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e28si3656722pgn.717.2017.12.07.05.27.16; Thu, 07 Dec 2017 05:27:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755818AbdLGN1O (ORCPT + 22 others); Thu, 7 Dec 2017 08:27:14 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:60109 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755593AbdLGN1M (ORCPT ); Thu, 7 Dec 2017 08:27:12 -0500 Received: from wuerfel.lan ([149.172.96.106]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.129]) with ESMTPA (Nemesis) id 0MXjM2-1ebmCE2ej0-00WTL5; Thu, 07 Dec 2017 14:26:48 +0100 From: Arnd Bergmann To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI Cc: Arnd Bergmann , Xin Long , Vasily Averin , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netfilter: fix clusterip_net_exit build regression Date: Thu, 7 Dec 2017 14:26:09 +0100 Message-Id: <20171207132636.259066-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:83RQHLtrjXPaurh43Wds9iHzptqs0sLBAPomhfh+zEwd00yyenO gEWs7o5Uf2MXwKpLxsUicTQsPiXo+CDHorKn9qL7AVzzUaOAGL2MojHACnDHvgcZ9aSkYan SPAtyU7OJ8wwO/ufNOvpcFQ3BBKIqfP3SfaaNEtYOfHjcFsw35rNWHVP/CudVQrqgIxEEXp 5PRyue2RB+6iUp2iayHVg== X-UI-Out-Filterresults: notjunk:1; V01:K0:mJizdJOD9X8=:q2VVh+PMLkhoUBiCUMHMwz vabqJqNJeiryCYHwOuEpEqGeeXoOHTEsA0css7CG3+dcrY+ilmAx455kZeiWfhX/tX5GwaXav 2dBAGZxrtphl7XdUTPliWEnK2b0WvPZ9TEwYh64hUQNpuO8RtgSw7kBxLxpZnZLO1KWUtoP6l 4OmYdSJUowjP0Un5Ej5qcBqS0YNP3KbCxwYDrg0DEfWTh9pJH5Ud0fSB9GMMhuoE+tztK0w5n uZvctQsbBsmu1VuYvFmXSOzcrsBHmn269PJxvrRyyve5hdSM0HL+MjU5oh3SkbCXkMKnO+Np2 WhumwAhCqzqLE2LZGKXlefAc+D3DkXi7HvjX0Ht0FLVK+U5d1lvqqQEfMJBBgFkkz10S30P5W M3uymsjagJ1O4vEWYaWOKEgSLLD11NsbBZYrMiGYimYDtu3I1QMGBMG4fdee2Sq/YLtRSwmKM qPuAyf/qahyEW60vakh6lSlIigeyF09WAf4Zys/fxYu3Dh+QonRxNsj4lYMsuBS2b/PcVOH2v BmOSiLieS7LhOOwuTZeyCYqVApm7NIugR5kYI3nVEAWr/seTDNtkJ9G5nWGxAWq6Q/l/N/tx9 XUDqkF6M7eS/KD+gp1tXzOb367UND51WrjIcM6INQgjAUsBfEHsOxTLhlcMz9R3bWYSRA+xUB 5+VHaHKakukr7hxsSSAfogvixEBnAqMYaJlLitzKUEeUG7/La1o8JGjqv6mYGKLWtg/ryDy/a /odwhbG9eXj9u7lx1LqsJ96vObcRKUPCM7jXn4FgQTflxqLhm0O/JGghZdI= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.0 Reviewed-by: Vasily Averin 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