From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753562AbYBQRzb (ORCPT ); Sun, 17 Feb 2008 12:55:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751297AbYBQRzL (ORCPT ); Sun, 17 Feb 2008 12:55:11 -0500 Received: from mgw1.diku.dk ([130.225.96.91]:58903 "EHLO mgw1.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750807AbYBQRzJ (ORCPT ); Sun, 17 Feb 2008 12:55:09 -0500 Date: Sun, 17 Feb 2008 18:55:06 +0100 (CET) From: Julia Lawall To: sct@redhat.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 2/7] fs/ext{2,3,4}: Use BUG_ON Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Julia Lawall if (...) BUG(); should be replaced with BUG_ON(...) when the test has no side-effects to allow a definition of BUG_ON that drops the code completely. fs/ext2/balloc.c | 3 +-- fs/ext2/dir.c | 3 +-- fs/ext3/balloc.c | 3 +-- fs/ext4/balloc.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @ disable unlikely @ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (unlikely(E)) { BUG(); } + BUG_ON(E); ) @@ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (E) { BUG(); } + BUG_ON(E); ) // Signed-off-by: Julia Lawall --- diff -u -p a/fs/ext2/balloc.c b/fs/ext2/balloc.c --- a/fs/ext2/balloc.c 2008-02-10 22:34:14.000000000 +0100 +++ b/fs/ext2/balloc.c 2008-02-17 16:39:35.000000000 +0100 @@ -245,8 +245,7 @@ restart: prev = rsv; } printk("Window map complete.\n"); - if (bad) - BUG(); + BUG_ON(bad); } #define rsv_window_dump(root, verbose) \ __rsv_window_dump((root), (verbose), __FUNCTION__) diff -u -p a/fs/ext2/dir.c b/fs/ext2/dir.c --- a/fs/ext2/dir.c 2008-02-10 22:34:14.000000000 +0100 +++ b/fs/ext2/dir.c 2008-02-17 16:39:36.000000000 +0100 @@ -41,8 +41,8 @@ static inline __le16 ext2_rec_len_to_dis { if (len == (1 << 16)) return cpu_to_le16(EXT2_MAX_REC_LEN); - else if (len > (1 << 16)) - BUG(); + else + BUG_ON(len > (1 << 16)); return cpu_to_le16(len); } diff -u -p a/fs/ext3/balloc.c b/fs/ext3/balloc.c --- a/fs/ext3/balloc.c 2008-02-10 22:34:14.000000000 +0100 +++ b/fs/ext3/balloc.c 2008-02-17 16:39:38.000000000 +0100 @@ -232,8 +232,7 @@ restart: prev = rsv; } printk("Window map complete.\n"); - if (bad) - BUG(); + BUG_ON(bad); } #define rsv_window_dump(root, verbose) \ __rsv_window_dump((root), (verbose), __FUNCTION__) diff -u -p a/fs/ext4/balloc.c b/fs/ext4/balloc.c --- a/fs/ext4/balloc.c 2008-02-10 22:34:14.000000000 +0100 +++ b/fs/ext4/balloc.c 2008-02-17 16:39:39.000000000 +0100 @@ -356,8 +356,7 @@ restart: prev = rsv; } printk("Window map complete.\n"); - if (bad) - BUG(); + BUG_ON(bad); } #define rsv_window_dump(root, verbose) \ __rsv_window_dump((root), (verbose), __FUNCTION__)