From patchwork Fri Mar 22 14:18:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 160905 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp869930jan; Fri, 22 Mar 2019 07:19:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqwt2fBYhIP8uGFgSWi9Cy4cHbxRY1Yn6cVpoNEMVU6g4243SaUnpkwdxAx5Q87FL8MD3Qqr X-Received: by 2002:a17:902:8644:: with SMTP id y4mr9477202plt.99.1553264356278; Fri, 22 Mar 2019 07:19:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553264356; cv=none; d=google.com; s=arc-20160816; b=e+wgW/f1tY9R7qBlQ9Xa+5fdW2hDHhWS0Jn/Yu06QTfmy6kNN0Fl3Zot5R2lYQky8a y8OdpH/M44zOQQETkX5U48m0Q0hOHPe6mtK+MC5lT93DSj++4D3mJeur8hMrGVVomvON qMvH4f40WTJCKfWSZN0McNYbF5u4u/4aGhc5QGCO//y8YxI4t+G2m01t+2Fl99HRxdtG xm/tvRLf/ZTNhHaQbyb/AI5YuKxH+mH1t+vzhByv/pmeglNzsjZA8oQi+B+ekav57j9w 4L1RAfxlnbQrbQH/35bOdEukDh0bTC5RehwMXMQyi5vR+W1xbtXA69P38yKPLTQPkVzm b8Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=+EnGS6u8QoFGet3W3wBM06rGFpwJ2Yx4l5cgzWNZPKY=; b=DOpNYXmplvG/FNK3F2ixGoKGwyOV/7mRfGkp4VKb2IlOgGKgyzJBgzgNg9JAZ1Y9f3 UNQ9JcpiERLP1HWh6sKNkYudbwUL5iTwa+6lDIvhhjhx9QHku7M9fopQCiSVviqwxXVx mvLAqU6vL3pN+2uOW/HG5RIxutmRAc/quGMZT7ea7Ete2BtFGbS+4b+E5PWAfoNsc8JP 2MXN1DUJiX0w/i8+LL/HGZ2+DYQFTxy5k8XfE6vdebX9+5uiAmh6Kobdrx9lqlZSH7bn +IpEl/jFCMh33BCokfy5wHfiJuareRJq6RSqAEB1QWdSq66ZGpB1MzRfevDN0iED3U5E sDDg== 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 i67si7294912pfb.117.2019.03.22.07.19.16; Fri, 22 Mar 2019 07:19:16 -0700 (PDT) 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 S1728604AbfCVOTO (ORCPT + 31 others); Fri, 22 Mar 2019 10:19:14 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:36893 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727944AbfCVOTO (ORCPT ); Fri, 22 Mar 2019 10:19:14 -0400 Received: from wuerfel.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MHG4c-1hBiji3hVQ-00DHSO; Fri, 22 Mar 2019 15:18:50 +0100 From: Arnd Bergmann To: David Howells , "David S. Miller" Cc: clang-built-linux@googlegroups.com, Nick Desaulniers , Nathan Chancellor , Arnd Bergmann , YueHaibing , linux-afs@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] rxrpc: avoid clang -Wuninitialized warning Date: Fri, 22 Mar 2019 15:18:43 +0100 Message-Id: <20190322141848.659387-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:TZm7rVj2j+bbMs9vH9SaW+4juFRIu0geiZSgLKt1E6Ol8L9GsR0 QODIlSgsI+mR8neza+DikcX0Q5FTXQIlW6c/WkMa06/PJ+U0McvNlLwXTimWzYh89Aq0EHR FBlGseNHtOIekDVYhGUScRFegfkIMgcSvsFanQsrz9HiMbiuBXinw0F2Nb+pYH8pyDDosSp 9mcdV8jBQ3tcQBhSA73DA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:ijt0N/z4PRk=:KkW9g1FXHbkjrAvfG+QEuu rMMDwFXoK2jklbzXZaRGEZzQEwYUFVCvffXBQdMCWITGdVhxdLnKjrALKUwG/dhJJn5trVQjq LHuoIaeVNO/+mnif5ON+Tw0BkgNoMGNgaZhfQIUVxEpHEMSeZmNfUasQQfVB1q5CadUpvvlCC QBaBJWxTquWvO0KFMQUDSCj4YqqL2pQQNhCUcYveGX3FkB4S4bMErPYNFspfP1hZmK1H04zDc cqWIerVos4o1XupTRZ2obmtozCbZorXnQcpppCx34pGLoxyXEQ8q6u4G+phl29D7TkHH0luK+ SYkxYr6tAE1eJf526X4q4W+T+WnE/mBO6AK6brPhGAjTKk1mrOoL6ao/aUt7WshecsN1PeUW7 ThHKQykEv/Gsq7wRF3xbqz3jp0jOeO+slg3WqbVaP1dPp0JACc8Jwnt/ZVqRRjywc8NevQqUK lMYF2UKOgt3LtXO/amFX4ZxQ7HYIGxfHT6rqdeApxPB2iBUQVlI5q+86I2Xz4MASwuqtGL1QO Im6y/REskZgdlDqHjGOyPnd/fo8ljA1J/CCVUJrJ780I3L+9gy6zBCym2SPmoicboO3TdPoPi Cz1tds6XIInK8hWtFBntIoBuj6pyMbxALh3FQFQAWwEWLX8ziP/HkrxJES3zON4eHzTYDimJA JiQc1wrHitYM0sCUVkFBX8qzRKoMkqZjEpfZ3ZYDFArRlHDeYsX/Z/Fcmm35WRrD8voBiVx8E XldoraWyNx/7F0VnerpzSE7BI1MLQu0X+lz5Jg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org clang produces a false-positive warning as it fails to notice that "lost = true" implies that "ret" is initialized: net/rxrpc/output.c:402:6: error: variable 'ret' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (lost) ^~~~ net/rxrpc/output.c:437:6: note: uninitialized use occurs here if (ret >= 0) { ^~~ net/rxrpc/output.c:402:2: note: remove the 'if' if its condition is always false if (lost) ^~~~~~~~~ net/rxrpc/output.c:339:9: note: initialize the variable 'ret' to silence this warning int ret, opt; ^ = 0 Rearrange the code to make that more obvious and avoid the warning. Signed-off-by: Arnd Bergmann --- net/rxrpc/output.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -- 2.20.0 Reviewed-by: Nathan Chancellor diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c index 736aa9281100..004c762c2e8d 100644 --- a/net/rxrpc/output.c +++ b/net/rxrpc/output.c @@ -335,7 +335,6 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct sk_buff *skb, struct kvec iov[2]; rxrpc_serial_t serial; size_t len; - bool lost = false; int ret, opt; _enter(",{%d}", skb->len); @@ -393,14 +392,14 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct sk_buff *skb, static int lose; if ((lose++ & 7) == 7) { ret = 0; - lost = true; + trace_rxrpc_tx_data(call, sp->hdr.seq, serial, + whdr.flags, retrans, true); + goto done; } } - trace_rxrpc_tx_data(call, sp->hdr.seq, serial, whdr.flags, - retrans, lost); - if (lost) - goto done; + trace_rxrpc_tx_data(call, sp->hdr.seq, serial, whdr.flags, retrans, + false); /* send the packet with the don't fragment bit set if we currently * think it's small enough */