Commit b1f3550f authored Mar 04, 2008 by Julia Lawall Committed by Mark Fasheh Apr 18, 2008

ocfs2: Use BUG_ON

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/

)

// <smpl>
@ 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);
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

parent c9ec1488

fs/ocfs2/alloc.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1029,8 +1029,7 @@ static void ocfs2_rotate_leaf(struct ocfs2_extent_list *el,
		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

fs/ocfs2/journal.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -717,8 +717,7 @@ int ocfs2_journal_load(struct ocfs2_journal *journal, int local)

		mlog_entry_void();

		if (!journal)
		BUG();
		BUG_ON(!journal);

		osb = journal->j_osb;

Admin message