diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-26 11:24:46 -0500 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-03-26 11:24:46 -0500 |
commit | e827f92355e1eeec2d227d3bd3350d04042a011e (patch) | |
tree | 87d1b735d59edcae4044b46157cb72de1a32af54 | |
parent | fddaaae16ba4d9f4d392a9ef94616d9d22485571 (diff) |
BUG_ON() Conversion in fs/buffer.c
this changes if() BUG(); constructs to BUG_ON() which is
cleaner and can better optimized away
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
-rw-r--r-- | fs/buffer.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 3b3ab5281920..4342ab0ad99a 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -796,8 +796,7 @@ void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode) | |||
796 | if (!mapping->assoc_mapping) { | 796 | if (!mapping->assoc_mapping) { |
797 | mapping->assoc_mapping = buffer_mapping; | 797 | mapping->assoc_mapping = buffer_mapping; |
798 | } else { | 798 | } else { |
799 | if (mapping->assoc_mapping != buffer_mapping) | 799 | BUG_ON(mapping->assoc_mapping != buffer_mapping); |
800 | BUG(); | ||
801 | } | 800 | } |
802 | if (list_empty(&bh->b_assoc_buffers)) { | 801 | if (list_empty(&bh->b_assoc_buffers)) { |
803 | spin_lock(&buffer_mapping->private_lock); | 802 | spin_lock(&buffer_mapping->private_lock); |
@@ -1114,8 +1113,7 @@ grow_dev_page(struct block_device *bdev, sector_t block, | |||
1114 | if (!page) | 1113 | if (!page) |
1115 | return NULL; | 1114 | return NULL; |
1116 | 1115 | ||
1117 | if (!PageLocked(page)) | 1116 | BUG_ON(!PageLocked(page)); |
1118 | BUG(); | ||
1119 | 1117 | ||
1120 | if (page_has_buffers(page)) { | 1118 | if (page_has_buffers(page)) { |
1121 | bh = page_buffers(page); | 1119 | bh = page_buffers(page); |
@@ -1522,8 +1520,7 @@ void set_bh_page(struct buffer_head *bh, | |||
1522 | struct page *page, unsigned long offset) | 1520 | struct page *page, unsigned long offset) |
1523 | { | 1521 | { |
1524 | bh->b_page = page; | 1522 | bh->b_page = page; |
1525 | if (offset >= PAGE_SIZE) | 1523 | BUG_ON(offset >= PAGE_SIZE); |
1526 | BUG(); | ||
1527 | if (PageHighMem(page)) | 1524 | if (PageHighMem(page)) |
1528 | /* | 1525 | /* |
1529 | * This catches illegal uses and preserves the offset: | 1526 | * This catches illegal uses and preserves the offset: |