diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index e7b2bafa1dd91cd69f8caf4597654a6355c3a666..c834f512dce5fc21026a2345ca6366d3092c2e77 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -245,8 +245,7 @@ static void __rsv_window_dump(struct rb_root *root, int verbose,
 		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 --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index a0995eb2dc232c2b7ddc79df644482a9a651c9e0..dd9dbb25eab2b2a64acdc8b999e94935b2676478 100644
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -41,8 +41,8 @@ static inline __le16 ext2_rec_len_to_disk(unsigned len)
 {
 	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);
 }