diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-31 18:14:43 -0500 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-03-31 18:14:43 -0500 |
commit | 0bf3ba538a150f8430104a50e88c1449e8fa1fe6 (patch) | |
tree | a44fc8bb4804ff132449f4ab96e0ed72bf836dda /fs/hfsplus | |
parent | 7dddb12c63553db850365cfd066a00416aa8c6cb (diff) |
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: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'fs/hfsplus')
-rw-r--r-- | fs/hfsplus/bnode.c | 6 | ||||
-rw-r--r-- | fs/hfsplus/btree.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c index 8f07e8fbd03d..746abc9ecf70 100644 --- a/fs/hfsplus/bnode.c +++ b/fs/hfsplus/bnode.c | |||
@@ -466,8 +466,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node) | |||
466 | for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)]; | 466 | for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)]; |
467 | *p && *p != node; p = &(*p)->next_hash) | 467 | *p && *p != node; p = &(*p)->next_hash) |
468 | ; | 468 | ; |
469 | if (!*p) | 469 | BUG_ON(!*p); |
470 | BUG(); | ||
471 | *p = node->next_hash; | 470 | *p = node->next_hash; |
472 | node->tree->node_hash_cnt--; | 471 | node->tree->node_hash_cnt--; |
473 | } | 472 | } |
@@ -622,8 +621,7 @@ void hfs_bnode_put(struct hfs_bnode *node) | |||
622 | 621 | ||
623 | dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n", | 622 | dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n", |
624 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); | 623 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); |
625 | if (!atomic_read(&node->refcnt)) | 624 | BUG_ON(!atomic_read(&node->refcnt)); |
626 | BUG(); | ||
627 | if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) | 625 | if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) |
628 | return; | 626 | return; |
629 | for (i = 0; i < tree->pages_per_bnode; i++) { | 627 | for (i = 0; i < tree->pages_per_bnode; i++) { |
diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c index a67edfa34e9e..effa8991999c 100644 --- a/fs/hfsplus/btree.c +++ b/fs/hfsplus/btree.c | |||
@@ -269,8 +269,7 @@ void hfs_bmap_free(struct hfs_bnode *node) | |||
269 | u8 *data, byte, m; | 269 | u8 *data, byte, m; |
270 | 270 | ||
271 | dprint(DBG_BNODE_MOD, "btree_free_node: %u\n", node->this); | 271 | dprint(DBG_BNODE_MOD, "btree_free_node: %u\n", node->this); |
272 | if (!node->this) | 272 | BUG_ON(!node->this); |
273 | BUG(); | ||
274 | tree = node->tree; | 273 | tree = node->tree; |
275 | nidx = node->this; | 274 | nidx = node->this; |
276 | node = hfs_bnode_find(tree, 0); | 275 | node = hfs_bnode_find(tree, 0); |