From patchwork Mon Mar 25 13:02: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: 161098 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3941455jan; Mon, 25 Mar 2019 06:03:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqwda+7ZwEnKdQDEqr8VYAn7PFSCDTyxQp6T7vJTLUwO3wq5eVc0qkjMj93NJKNb83WxU88C X-Received: by 2002:a17:902:d70f:: with SMTP id w15mr25242366ply.234.1553519004802; Mon, 25 Mar 2019 06:03:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553519004; cv=none; d=google.com; s=arc-20160816; b=RXGL5mFIKc+0t9osH3lw1lB2ywp48l1uuAibmYoI3WWaZEYSYqsbanqaZZKXoJeKBw L/RwxsU+I2UoL1R1+9fEyCmJiB+bnqfSnkquzvWsvLgo6hE5wPpBozIcRd7BIg3eDKsS TgxRLCn/ZyCyk59q4aQsqwiUu7mXK7/7m7JcyXaxPX0Vh4i9Q5Yy2Sozs4CrA22x0hCz yaDhhUvvfwnhlsbBQ6gNTTLynwC2ffS49oaA+RCQPIXiQBPs+pqKsZCrOjg/OKx/47sm psoUZT9CqxJ+AbcdORye2SUjMK3rw1mkvLDBd8gE5lRCFzO/v6zRR2du7T12AzG8+LCs QDWg== 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=TIehculd5W2wrD0ox/+55U+Kc4N7jxZDm78WTOwMbCM=; b=E8AEk6q8eJIfrMuKoNK+wZg6otNR3EZBzbEuw5pgmTZCdNs4M/32/wyMyyuF67LKtC 2O+zftY+Ps0fq6tO7rEzLyMzRoz6MaCSY9CPRnqeKXY8DCnWipy6Eb5do5kvTvIIogK0 GLHk4iRubFrLD/G+uoTAk0JqRI54ioopXzfaH/VNxVAhMjZmsAIB+NH1G5x+JWZG+GUR oZfgWPefCd1HCFV342HxXmnrVQlne2BNw5WLfRjfQgIKIW11xUmMAt/edBOaUojH6T0a x28uDWN2w00ce/NO6HX+Q32B+3W0wuHUOZgY46sxrr34Qw7OTSQH0PbBkl6hW3nCRGI3 ehGA== 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 b31si13802586pgl.5.2019.03.25.06.03.24; Mon, 25 Mar 2019 06:03:24 -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 S1731308AbfCYNDX (ORCPT + 31 others); Mon, 25 Mar 2019 09:03:23 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:38333 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731076AbfCYNDW (ORCPT ); Mon, 25 Mar 2019 09:03:22 -0400 Received: from wuerfel.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MMGVE-1hRapZ3ztO-00JKql; Mon, 25 Mar 2019 14:03:00 +0100 From: Arnd Bergmann To: Chris Mason , Josef Bacik , David Sterba Cc: clang-built-linux@googlegroups.com, Nick Desaulniers , Nathan Chancellor , Arnd Bergmann , Qu Wenruo , Nikolay Borisov , Liu Bo , Filipe Manana , Johannes Thumshirn , Anand Jain , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] btrfs: use BUG() instead of BUG_ON(1) Date: Mon, 25 Mar 2019 14:02:25 +0100 Message-Id: <20190325130256.1437810-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:WqqCRr9aq0/fLvIfqpd28fO+ZL8fbeXMaYJ9mlmB6vGx3b7d52g Mrjh0HviXccZpcSBkqiCFR2I4XUqKw67MI9W3ERfs8+LjSPRXaBDRL6ltvjLkAq5nDpmZei uyCz7Q3P2IJE+hEG76WUx8rWEV2DLmYF5KqMaBKMYaBu6MuW/lZIMgxNBP/0jqXvPJ1AVWD NaV9rNUulQjkLPc60OqTw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:98ogSmodF9g=:wSV1b4N3opQzNtjzrfAO+P LuKJWRgwm7hVqKDQIxAGaFQUIxT+7DKH0/dyWQpOBt3CQntyIl19uCp8ZhPSToiqIwrQ5SnE/ E8emxS3opGD7E11lEg3+OzS2RXlagfwFPf0jq0iCsSq+3loe7Roj62QxvRtW0Gv6M3vPFOtk7 q8c+ULmmejsXw2y2NPGuiZIPQowmwfllOk0fuYGZboToNFC4rgge3ZoiM0S5fm8XoOFoDvEvF UEFLGi7T5DnCpnR89f9z3c8dyX6qIASgpyU7UtQu5zuOvEpEZDbCn90LsKFS0jKZN/2mBZ1WT uELH/y9YODouaeSPOrIafYqdZaYZepsgrXV+x2MKT71mEq5IuVZPCHAvcGVgX5qCNiy5ZzZQt R28x+Z5v+JyGO/k3yHkmg0NlR0kiduzOPHBzkO8hZKMMJFabAxF+crimMqWUWnv+LItubMje5 p8/L8GqzDv3HioHe28MC7NTxZ4Rt7PPOcjTPQhxK8i7Tn3+GcAybUkW0QVA1WZfZYPhfnOFLI Mn+My4UeUFOveeY0B7htLaaKOLV3AHG/akt0A6wDL23ZY5RtDxuo3P9+CoxuLbjJlw8KRMlKh bb8ZGg4Z4c8g9s/sPdnRIyY0ljRNrRR9tdORyDOw1cqgG5/kmhdchUVBLl79/OCnDz0CQWbaP OQPF52pKk7FQ5x//fl3Vp0ozIXBgeXxrFa1MALxRwmoAiptaXMUkTjRunR8PJfX4t6qng9RzG ZOsTFGyjev1ZMhQnd+BCFu74LnaZQEmRTkF+vQ== 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/btrfs/volumes.c:5041:3: error: variable 'max_chunk_size' 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' #define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while (0) ^~~~~~~~~~~~~~~~~~~ include/linux/compiler.h:48:23: note: expanded from macro 'unlikely' # define unlikely(x) (__branch_check__(x, 0, __builtin_constant_p(x))) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fs/btrfs/volumes.c:5046:9: note: uninitialized use occurs here max_chunk_size); ^~~~~~~~~~~~~~ include/linux/kernel.h:860:36: note: expanded from macro 'min' #define min(x, y) __careful_cmp(x, y, <) ^ include/linux/kernel.h:853:17: note: expanded from macro '__careful_cmp' __cmp_once(x, y, __UNIQUE_ID(__x), __UNIQUE_ID(__y), op)) ^ include/linux/kernel.h:847:25: note: expanded from macro '__cmp_once' typeof(y) unique_y = (y); \ ^ fs/btrfs/volumes.c:5041:3: 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' #define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while (0) ^ fs/btrfs/volumes.c:4993:20: note: initialize the variable 'max_chunk_size' to silence this warning u64 max_chunk_size; ^ = 0 Change it to BUG() so clang can see that this code path can never continue. Signed-off-by: Arnd Bergmann --- fs/btrfs/backref.c | 4 ++-- fs/btrfs/ctree.c | 4 ++-- fs/btrfs/extent_io.c | 8 ++++---- fs/btrfs/file.c | 2 +- fs/btrfs/inode.c | 2 +- fs/btrfs/root-tree.c | 2 +- fs/btrfs/volumes.c | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) -- 2.20.0 Reviewed-by: Nikolay Borisov diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 11459fe84a29..2602072ed906 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -791,7 +791,7 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, count = node->ref_mod * -1; break; default: - BUG_ON(1); + BUG(); } *total_refs += count; switch (node->type) { @@ -1747,7 +1747,7 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, else if (flags & BTRFS_EXTENT_FLAG_DATA) *flags_ret = BTRFS_EXTENT_FLAG_DATA; else - BUG_ON(1); + BUG(); return 0; } diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 324df36d28bf..75c69829d975 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -4674,7 +4674,7 @@ void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path, btrfs_print_leaf(leaf); btrfs_crit(fs_info, "slot %d too large, nritems %d", slot, nritems); - BUG_ON(1); + BUG(); } /* @@ -4754,7 +4754,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path, btrfs_print_leaf(leaf); btrfs_crit(fs_info, "slot %d old_data %d data_end %d", slot, old_data, data_end); - BUG_ON(1); + BUG(); } /* * item0..itemN ... dataN.offset..dataN.size .. data0.size diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index ca8b8e785cf3..610a98857e22 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -5746,13 +5746,13 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, btrfs_err(fs_info, "memmove bogus src_offset %lu move len %lu dst len %lu", src_offset, len, dst->len); - BUG_ON(1); + BUG(); } if (dst_offset + len > dst->len) { btrfs_err(fs_info, "memmove bogus dst_offset %lu move len %lu dst len %lu", dst_offset, len, dst->len); - BUG_ON(1); + BUG(); } while (len > 0) { @@ -5793,13 +5793,13 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, btrfs_err(fs_info, "memmove bogus src_offset %lu move len %lu len %lu", src_offset, len, dst->len); - BUG_ON(1); + BUG(); } if (dst_offset + len > dst->len) { btrfs_err(fs_info, "memmove bogus dst_offset %lu move len %lu len %lu", dst_offset, len, dst->len); - BUG_ON(1); + BUG(); } if (dst_offset < src_offset) { memcpy_extent_buffer(dst, dst_offset, src_offset, len); diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 34fe8a58b0e9..f28aed471693 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1025,7 +1025,7 @@ int __btrfs_drop_extents(struct btrfs_trans_handle *trans, continue; } - BUG_ON(1); + BUG(); } if (!ret && del_nr > 0) { diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 82fdda8ff5ab..98bc66d34e6c 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1451,7 +1451,7 @@ static noinline int run_delalloc_nocow(struct inode *inode, extent_end = ALIGN(extent_end, fs_info->sectorsize); } else { - BUG_ON(1); + BUG(); } out_check: if (extent_end <= start) { diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index 893d12fbfda0..552efc88a016 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -141,7 +141,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root btrfs_print_leaf(path->nodes[0]); btrfs_crit(fs_info, "unable to update root key %llu %u %llu", key->objectid, key->type, key->offset); - BUG_ON(1); + BUG(); } l = path->nodes[0]; diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 9024eee889b9..95223fd9f9d0 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5038,7 +5038,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, } else { btrfs_err(info, "invalid chunk type 0x%llx requested", type); - BUG_ON(1); + BUG(); } /* We don't want a chunk larger than 10% of writable space */