From patchwork Mon Mar 25 13:00:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 161097 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3937936jan; Mon, 25 Mar 2019 06:00:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqzz6GbPzZjE4Mbe7a93Vm2uybInr5EnupYbpG9nSqXI8YNgHL0+lwJfD4YAnDNl1gykB+/j X-Received: by 2002:a17:902:2848:: with SMTP id e66mr25587743plb.181.1553518852807; Mon, 25 Mar 2019 06:00:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553518852; cv=none; d=google.com; s=arc-20160816; b=GyannIVmLzK8se3QExn2KKiJsdtvg4BvtbjpHUwOyyqwss37EYTJLixd6P7ono4iDC pKhdyJnsrb9D38fYGNCIj25/5Bf5T/zNKg/FDHhgcgufm1lOrmMrXKnoPEjxGYrgTiko aa3Cg7sy2Tx1qZRSntGuu38XCfE9jVMUz2xeyQ7ZbXqIqfYunpnbUvbcPguk4k8X4tVz Y0F1YHjRo8U1ueuFQPQ4VGJaFaLLR1/GUQEYQ1N92sIlNON7TVUbf1Bn3gg4CTvhZGC9 QwWjjTBe6BCOHzqvcWyZV2I2NBf3dAf7ogPbsy37yzboq0gJEewPsj0X75n3N2o5T2/N rVgA== 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=oJPHDO7wSCrWMr7AXCrM8dHPlpcXd1vB9Sbl0JXR/Vg=; b=UWhgGigOEeYOwpWs3GI7dYZjR+VuWYNFTYEU3KvthXMs0lBgiQ11vkHOgpTsuGwQXB RFoF+Iv9Ky1iTlFc+MaVqJWIA7dt/9SyBWEZS8dX+qsUQjK2TPpSBKWWh4oEOvgk2u6E cIqRPGylheOvaxdb5bXpCo4r9x89ZVFRRdkija4MLhON0+ON8PnBkF4zRXUW18/rtbbs CiBjQyaMFaIh4NBl2o40JLa2rCnR4+N2q+cV1S65CFLgUpdcviKyfbx4Z8RQvyXIK3F1 N8vfpPABFDOew//wJpX37YRGWGui8TNzWH7gI3Mkw61ENgglAAY64+WDbmliXq+g62Bc 6iQA== 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 h127si14179722pfb.213.2019.03.25.06.00.52; Mon, 25 Mar 2019 06:00:52 -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 S1731357AbfCYNAv (ORCPT + 31 others); Mon, 25 Mar 2019 09:00:51 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:52003 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731166AbfCYNAu (ORCPT ); Mon, 25 Mar 2019 09:00:50 -0400 Received: from wuerfel.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MYcy3-1hVBFa3ZjP-00Vckl; Mon, 25 Mar 2019 14:00:41 +0100 From: Arnd Bergmann To: "Theodore Ts'o" , Andreas Dilger Cc: clang-built-linux@googlegroups.com, Nick Desaulniers , Nathan Chancellor , Arnd Bergmann , Eric Whitney , Sean Fu , Jan Kara , Eric Biggers , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ext4: use BUG() instead of BUG_ON(1) Date: Mon, 25 Mar 2019 14:00:25 +0100 Message-Id: <20190325130040.1437445-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:XEkcvIk1pYTWgdR+sAkYhTO1RRjWg8B5vvNlB7QcoiS1tnjfmVG NPe1IiRrQRvV9hkJRruQShim4S9Jspnd6/IY0wVET/d+LwgNT8B1iba+CjRBEKoZw5i6cRd q5VQk2r9smg0mi+ONUBTkBGjdBFY4kS4RkfjThhQhRT8D6DMK4kDgv0hBzaq2F9WstvUfhU Edkcxj4DdWAZm4ouyF95g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:xQ9yD33iYgY=:PBt945K92l971pKmGyQkhW Tn9t1UZ28/jKk1IIWZJX0Tc5NsaYqQPq3w4Q7B2T1PP1XpKWIVBxMWuD33oA1fA5ieYH+wKsR pz8xHFRLC3PgDrfy2aKJjFkNrfFnB3OovpaeM7ZoIDJ3qzXvpq6KQnIKIWLs5ldb9+dcS8Q3V vs6bazv+eqp8Tyj4J9+jRf3Xb5kQwhsAEQktguc+sr9Od681prnmP7NVDp4W1EH4nZnaPLNDG leqsVkTk5Q2QfA771hEc3amD+1djhoX3xeIKCqNelBzLiglX8sZHNmDsoKzLh5AHa4IGr0SGO BZEz0ixmiU5HIOwVkw6piTdrkEiMxHRh5eZVLhT32ANF2oDKEkPeToZNJdhNDguw1lOoCc8if D3BcwewlEfGnuUfW59SoEeln74ACh0w7t7YG81u6JXolnVcU4D4SzvA5hq4QS2PWOuDnZAsJP Ok4w63/46y9VNz5B7gQKlP4x1tv31OJu25MBzc+utK/p/UN6OOcEdFademrPGZyBKH3GH6e5z YL6q3/2bx50Q9HIPtR/XHsGnGJFK+skTFaKovzOa9WvL3ZCLMVNAJBmHFQZSe0avcHEOcPUPZ B+7qZIiB3WWWnEZKpEdPDUxBhN/zbEkoPOyJEKGh5MgKdDQ030RdDmpnasiNEm/N+JOr0yKXd bhGrXrsl9WPYADLB1N/mXnSqENIiXij479WZe1RmhVL3EGut1pIOJA4HLRUIzk5VrHlD7p3z+ bHt4cwucBRUlC1ofXZGkc8CwGk8nlkY0C3ppwQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org BUG_ON(1) leads to bogus warnings from clang when CONFIG_PROFILE_ANNOTATED_BRANCHES is set: fs/ext4/inode.c:544:4: error: variable 'retval' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] BUG_ON(1); ^~~~~~~~~ include/asm-generic/bug.h:61:36: note: expanded from macro 'BUG_ON' ^~~~~~~~~~~~~~~~~~~ include/linux/compiler.h:48:23: note: expanded from macro 'unlikely' ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fs/ext4/inode.c:591:6: note: uninitialized use occurs here if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) { ^~~~~~ fs/ext4/inode.c:544:4: note: remove the 'if' if its condition is always true BUG_ON(1); ^ include/asm-generic/bug.h:61:32: note: expanded from macro 'BUG_ON' ^ fs/ext4/inode.c:502:12: note: initialize the variable 'retval' to silence this warning Change it to BUG() so clang can see that this code path can never continue. Signed-off-by: Arnd Bergmann --- fs/ext4/extents_status.c | 4 ++-- fs/ext4/inode.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.20.0 Reviewed-by: Nick Desaulniers Reviewed-by: Jan Kara diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 2b439afafe13..023a3eb3afa3 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -711,7 +711,7 @@ static void ext4_es_insert_extent_ind_check(struct inode *inode, * We don't need to check unwritten extent because * indirect-based file doesn't have it. */ - BUG_ON(1); + BUG(); } } else if (retval == 0) { if (ext4_es_is_written(es)) { @@ -780,7 +780,7 @@ static int __es_insert_extent(struct inode *inode, struct extent_status *newes) } p = &(*p)->rb_right; } else { - BUG_ON(1); + BUG(); return -EINVAL; } } diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index b32a57bc5d5d..190f0478582a 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -541,7 +541,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, map->m_len = retval; retval = 0; } else { - BUG_ON(1); + BUG(); } #ifdef ES_AGGRESSIVE_TEST ext4_map_blocks_es_recheck(handle, inode, map, @@ -1876,7 +1876,7 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, else if (ext4_es_is_unwritten(&es)) map->m_flags |= EXT4_MAP_UNWRITTEN; else - BUG_ON(1); + BUG(); #ifdef ES_AGGRESSIVE_TEST ext4_map_blocks_es_recheck(NULL, inode, map, &orig_map, 0);