Commit 0bf3ba53 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Adrian Bunk

BUG_ON() Conversion in fs/hfsplus/

this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.
Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent 7dddb12c
...@@ -466,8 +466,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node) ...@@ -466,8 +466,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node)
for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)]; for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)];
*p && *p != node; p = &(*p)->next_hash) *p && *p != node; p = &(*p)->next_hash)
; ;
if (!*p) BUG_ON(!*p);
BUG();
*p = node->next_hash; *p = node->next_hash;
node->tree->node_hash_cnt--; node->tree->node_hash_cnt--;
} }
...@@ -622,8 +621,7 @@ void hfs_bnode_put(struct hfs_bnode *node) ...@@ -622,8 +621,7 @@ void hfs_bnode_put(struct hfs_bnode *node)
dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n", dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n",
node->tree->cnid, node->this, atomic_read(&node->refcnt)); node->tree->cnid, node->this, atomic_read(&node->refcnt));
if (!atomic_read(&node->refcnt)) BUG_ON(!atomic_read(&node->refcnt));
BUG();
if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock))
return; return;
for (i = 0; i < tree->pages_per_bnode; i++) { for (i = 0; i < tree->pages_per_bnode; i++) {
......
...@@ -269,8 +269,7 @@ void hfs_bmap_free(struct hfs_bnode *node) ...@@ -269,8 +269,7 @@ void hfs_bmap_free(struct hfs_bnode *node)
u8 *data, byte, m; u8 *data, byte, m;
dprint(DBG_BNODE_MOD, "btree_free_node: %u\n", node->this); dprint(DBG_BNODE_MOD, "btree_free_node: %u\n", node->this);
if (!node->this) BUG_ON(!node->this);
BUG();
tree = node->tree; tree = node->tree;
nidx = node->this; nidx = node->this;
node = hfs_bnode_find(tree, 0); node = hfs_bnode_find(tree, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment