Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751534AbdCZQYf (ORCPT ); Sun, 26 Mar 2017 12:24:35 -0400 Received: from www.osadl.org ([62.245.132.105]:36465 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751439AbdCZQYe (ORCPT ); Sun, 26 Mar 2017 12:24:34 -0400 From: Nicholas Mc Guire To: Tejun Heo Cc: Zefan Li , Andrew Morton , Michal Hocko , Vlastimil Babka , Ingo Molnar , Joonwoo Park , Miao Xie , linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH] cgroup: switch to BUG_ON() Date: Sun, 26 Mar 2017 18:24:06 +0200 Message-Id: <1490545446-7305-1-git-send-email-der.herr@hofr.at> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1769 Lines: 52 Use BUG_ON() rather than an explicit if followed by BUG() for improved readability and also consistency. Signed-off-by: Nicholas Mc Guire --- Found by coccinelle: bugon.cocci ./kernel/cgroup/cpuset.c:2125:2-5: WARNING: Use BUG_ON instead of if condition followed by BUG. ./kernel/cgroup/cpuset.c:2127:2-5: WARNING: Use BUG_ON instead of if condition followed by BUG. ./kernel/cgroup/cpuset.c:2143:2-5: WARNING: Use BUG_ON instead of if condition followed by BUG. BUG_ON() wraps the explicit if condition and is actually in use for all conditional BUG() cases in cpuset.c except in this one function. Patch was compile-tested with: x86_64_defconfig (implies CONFIG_CPUSETS=y) (checkpatch warnings for this patch seem to be false-positives - the BUG_ON should be fine) Patch is against 4.11-rc3 (localversion-next is next-20170324) kernel/cgroup/cpuset.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 0f41292..8b84db2 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -2121,10 +2121,8 @@ int __init cpuset_init(void) { int err = 0; - if (!alloc_cpumask_var(&top_cpuset.cpus_allowed, GFP_KERNEL)) - BUG(); - if (!alloc_cpumask_var(&top_cpuset.effective_cpus, GFP_KERNEL)) - BUG(); + BUG_ON(!alloc_cpumask_var(&top_cpuset.cpus_allowed, GFP_KERNEL)); + BUG_ON(!alloc_cpumask_var(&top_cpuset.effective_cpus, GFP_KERNEL)); cpumask_setall(top_cpuset.cpus_allowed); nodes_setall(top_cpuset.mems_allowed); @@ -2139,8 +2137,7 @@ int __init cpuset_init(void) if (err < 0) return err; - if (!alloc_cpumask_var(&cpus_attach, GFP_KERNEL)) - BUG(); + BUG_ON(!alloc_cpumask_var(&cpus_attach, GFP_KERNEL)); return 0; } -- 2.1.4