From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + fs-ocfs2-use-bug_on.patch added to -mm tree Date: Fri, 22 Feb 2008 23:30:22 -0800 Message-ID: <200802230731.m1N7VBoa017987@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([207.189.120.13]:34202 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751301AbYBWHxH (ORCPT ); Sat, 23 Feb 2008 02:53:07 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: julia@diku.dk The patch titled fs/ocfs2: Use BUG_ON has been added to the -mm tree. Its filename is fs-ocfs2-use-bug_on.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fs/ocfs2: Use BUG_ON 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. 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 Signed-off-by: Andrew Morton --- fs/ocfs2/alloc.c | 3 +-- fs/ocfs2/journal.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff -puN fs/ocfs2/alloc.c~fs-ocfs2-use-bug_on fs/ocfs2/alloc.c --- a/fs/ocfs2/alloc.c~fs-ocfs2-use-bug_on +++ a/fs/ocfs2/alloc.c @@ -1029,8 +1029,7 @@ static void ocfs2_rotate_leaf(struct ocf BUG_ON(!next_free); /* The tree code before us didn't allow enough room in the leaf. */ - if (el->l_next_free_rec == el->l_count && !has_empty) - BUG(); + BUG_ON(el->l_next_free_rec == el->l_count && !has_empty); /* * The easiest way to approach this is to just remove the diff -puN fs/ocfs2/journal.c~fs-ocfs2-use-bug_on fs/ocfs2/journal.c --- a/fs/ocfs2/journal.c~fs-ocfs2-use-bug_on +++ a/fs/ocfs2/journal.c @@ -586,8 +586,7 @@ int ocfs2_journal_load(struct ocfs2_jour mlog_entry_void(); - if (!journal) - BUG(); + BUG_ON(!journal); osb = journal->j_osb; _ Patches currently in -mm which might be from julia@diku.dk are sound-use-bug_on.patch git-hid.patch git-net.patch drivers-net-mv643xx_ethc-use-field_sizeof.patch fs-ocfs2-use-bug_on.patch s390-use-div_round_up.patch drivers-block-viodasdc-use-field_sizeof.patch usb-use-div_round_up.patch fs-affs-filec-use-bug_on.patch fbdev-use-div_round_up-or-roundup.patch fs-ext2-use-bug_on.patch fs-ext3-use-bug_on.patch fs-ext4-use-bug_on.patch