[KJ] [Patch 2/8] BUG_ON() Conversion in fs/buffer.c

[KJ] [Patch 2/8] BUG_ON() Conversion in fs/buffer.c

[Eric Sesterhenn / snakebyte]

[-- Attachment #1: Type: text/plain, Size: 1168 bytes --]

hi,

this changes if() BUG(); constructs to BUG_ON() which is
cleaner and can better optimized away

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>

--- linux-2.6.16-rc1-git4/fs/buffer.c.orig	2006-01-26 17:52:56.000000000 +0100
+++ linux-2.6.16-rc1-git4/fs/buffer.c	2006-01-26 17:54:08.000000000 +0100
@@ -801,8 +801,7 @@ void mark_buffer_dirty_inode(struct buff
 	if (!mapping->assoc_mapping) {
 		mapping->assoc_mapping = buffer_mapping;
 	} else {
-		if (mapping->assoc_mapping != buffer_mapping)
-			BUG();
+		BUG_ON(mapping->assoc_mapping != buffer_mapping);
 	}
 	if (list_empty(&bh->b_assoc_buffers)) {
 		spin_lock(&buffer_mapping->private_lock);
@@ -1118,8 +1117,7 @@ grow_dev_page(struct block_device *bdev,
 	if (!page)
 		return NULL;
 
-	if (!PageLocked(page))
-		BUG();
+	BUG_ON(!PageLocked(page));
 
 	if (page_has_buffers(page)) {
 		bh = page_buffers(page);
@@ -1526,8 +1524,7 @@ void set_bh_page(struct buffer_head *bh,
 		struct page *page, unsigned long offset)
 {
 	bh->b_page = page;
-	if (offset >= PAGE_SIZE)
-		BUG();
+	BUG_ON(offset >= PAGE_SIZE);
 	if (PageHighMem(page))
 		/*
 		 * This catches illegal uses and preserves the offset:



[-- Attachment #2: Type: text/plain, Size: 168 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors