From 91b851f5c2302c9e44e510df55d09bff4838f31a Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 4 Mar 2008 15:21:05 -0800
Subject: [PATCH] --- yaml --- r: 89598 b: refs/heads/master c:
 b1f3550fa1471b691ad6c2f35b5b22e93eaa5855 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/ocfs2/alloc.c   | 3 +--
 trunk/fs/ocfs2/journal.c | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c95a1fae73f7..c2e92b030b78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9ec14884d69a303eef4faae42bd3c4e25b19941
+refs/heads/master: b1f3550fa1471b691ad6c2f35b5b22e93eaa5855
diff --git a/trunk/fs/ocfs2/alloc.c b/trunk/fs/ocfs2/alloc.c
index a26882144e8f..41f84c92094f 100644
--- a/trunk/fs/ocfs2/alloc.c
+++ b/trunk/fs/ocfs2/alloc.c
@@ -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
diff --git a/trunk/fs/ocfs2/journal.c b/trunk/fs/ocfs2/journal.c
index bffd2d714f67..9698338adc39 100644
--- a/trunk/fs/ocfs2/journal.c
+++ b/trunk/fs/ocfs2/journal.c
@@ -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;