From patchwork Fri Oct 5 14:55:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1553741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id A8B253FCFC for ; Fri, 5 Oct 2012 15:02:58 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TK9NU-0005Sy-Lv; Fri, 05 Oct 2012 14:59:49 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TK9Jv-0003ds-Kk for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2012 14:56:17 +0000 Received: from klappe2.boeblingen.de.ibm.com (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0MFVyq-1TEarQ1k28-00ELUe; Fri, 05 Oct 2012 16:55:48 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/16] ipvs: fix ip_vs_set_timeout debug messages Date: Fri, 5 Oct 2012 16:55:22 +0200 Message-Id: <1349448930-23976-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349448930-23976-1-git-send-email-arnd@arndb.de> References: <1349448930-23976-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:15PWLEmIEoMWV8roWyUOu+kbM8WPb8gdE6moE2RrSEZ wpH81CFYKbfC0Wnn9ylbDjzA4r65FSacFpRIX/cZH+dLELvJSl 82rirP0W0OBlJoCIoDbvZJJUOBLb2/DnjIk/26EbNwFIhyyJVx ccXHwh2u/avZanxfR+IGNmtJHT6iXL7nKXMzn3dJwI3XE8zrLl ctUKcC5whjeCJ71S8RKxNxLfWig9k285U5x1RI1Rnf7AafBzvY 6FpgRTl0AkayYrmIvvuif35/EWVRL+UxKdDfNGAxIzwYvEhg2t SUXe7eBgpJUxpu45Gl8oUhnBmR+yYkI6WGH09K37/8wfXGulCE XPsihERSsaCUNDJCSJFSrsOeYmtH4a9+uPYM/TUKWdiUsoQrPa AllfrULIukg3yWXqs1I7A5V0iD/MM3Vv4Y= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: netfilter@vger.kernel.org, coreteam@netfilter.org, arm@kernel.org, Arnd Bergmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Julian Anastasov , Simon Horman , netfilter-devel@vger.kernel.org, "David S. Miller" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The ip_vs_set_timeout function sets timeouts for TCP and UDP, which can be enabled independently at compile time. The debug message always prints both timeouts that are passed into the function, but if one is disabled, the message will show uninitialized data. This splits the debug message into two separte IP_VS_DBG statements that are in the same #ifdef section to ensure we only print the text about what is actually going on. Without this patch, building ARM ixp4xx_defconfig results in: net/netfilter/ipvs/ip_vs_ctl.c: In function 'ip_vs_genl_set_cmd': net/netfilter/ipvs/ip_vs_ctl.c:2238:47: warning: 't.udp_timeout' may be used uninitialized in this function [-Wuninitialized] net/netfilter/ipvs/ip_vs_ctl.c:3322:28: note: 't.udp_timeout' was declared here net/netfilter/ipvs/ip_vs_ctl.c:2238:47: warning: 't.tcp_fin_timeout' may be used uninitialized in this function [-Wuninitialized] net/netfilter/ipvs/ip_vs_ctl.c:3322:28: note: 't.tcp_fin_timeout' was declared here net/netfilter/ipvs/ip_vs_ctl.c:2238:47: warning: 't.tcp_timeout' may be used uninitialized in this function [-Wuninitialized] net/netfilter/ipvs/ip_vs_ctl.c:3322:28: note: 't.tcp_timeout' was declared here Signed-off-by: Arnd Bergmann Cc: David S. Miller Cc: netdev@vger.kernel.org Cc: Simon Horman Cc: Julian Anastasov Cc: netfilter-devel@vger.kernel.org Cc: netfilter@vger.kernel.org Cc: coreteam@netfilter.org --- net/netfilter/ipvs/ip_vs_ctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index f51013c..f3a66c3 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -2237,12 +2237,11 @@ static int ip_vs_set_timeout(struct net *net, struct ip_vs_timeout_user *u) struct ip_vs_proto_data *pd; #endif - IP_VS_DBG(2, "Setting timeout tcp:%d tcpfin:%d udp:%d\n", +#ifdef CONFIG_IP_VS_PROTO_TCP + IP_VS_DBG(2, "Setting timeout tcp:%d tcpfin:%d\n", u->tcp_timeout, - u->tcp_fin_timeout, - u->udp_timeout); + u->tcp_fin_timeout); -#ifdef CONFIG_IP_VS_PROTO_TCP if (u->tcp_timeout) { pd = ip_vs_proto_data_get(net, IPPROTO_TCP); pd->timeout_table[IP_VS_TCP_S_ESTABLISHED] @@ -2257,6 +2256,9 @@ static int ip_vs_set_timeout(struct net *net, struct ip_vs_timeout_user *u) #endif #ifdef CONFIG_IP_VS_PROTO_UDP + IP_VS_DBG(2, "Setting timeout udp:%d\n", + u->udp_timeout); + if (u->udp_timeout) { pd = ip_vs_proto_data_get(net, IPPROTO_UDP); pd->timeout_table[IP_VS_UDP_S_NORMAL]