diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-26 11:26:51 -0500 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-03-26 11:26:51 -0500 |
commit | 4d4ef9abe34a472fbfc9ab75cfde0d58bc342c44 (patch) | |
tree | 77bb1b3be39cb94c7ee6dc71a740a74ea756527f /fs/hfs/bnode.c | |
parent | 28133c7b2b9bbdf8a8765a319e818c1652f38c1f (diff) |
BUG_ON() Conversion in fs/hfs/
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/hfs/bnode.c')
-rw-r--r-- | fs/hfs/bnode.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c index a7a7d77f3fd3..1e44dcfe49c4 100644 --- a/fs/hfs/bnode.c +++ b/fs/hfs/bnode.c | |||
@@ -306,8 +306,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node) | |||
306 | for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)]; | 306 | for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)]; |
307 | *p && *p != node; p = &(*p)->next_hash) | 307 | *p && *p != node; p = &(*p)->next_hash) |
308 | ; | 308 | ; |
309 | if (!*p) | 309 | BUG_ON(!*p); |
310 | BUG(); | ||
311 | *p = node->next_hash; | 310 | *p = node->next_hash; |
312 | node->tree->node_hash_cnt--; | 311 | node->tree->node_hash_cnt--; |
313 | } | 312 | } |
@@ -415,8 +414,7 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num) | |||
415 | spin_lock(&tree->hash_lock); | 414 | spin_lock(&tree->hash_lock); |
416 | node = hfs_bnode_findhash(tree, num); | 415 | node = hfs_bnode_findhash(tree, num); |
417 | spin_unlock(&tree->hash_lock); | 416 | spin_unlock(&tree->hash_lock); |
418 | if (node) | 417 | BUG_ON(node); |
419 | BUG(); | ||
420 | node = __hfs_bnode_create(tree, num); | 418 | node = __hfs_bnode_create(tree, num); |
421 | if (!node) | 419 | if (!node) |
422 | return ERR_PTR(-ENOMEM); | 420 | return ERR_PTR(-ENOMEM); |
@@ -459,8 +457,7 @@ void hfs_bnode_put(struct hfs_bnode *node) | |||
459 | 457 | ||
460 | dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n", | 458 | dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n", |
461 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); | 459 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); |
462 | if (!atomic_read(&node->refcnt)) | 460 | BUG_ON(!atomic_read(&node->refcnt)); |
463 | BUG(); | ||
464 | if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) | 461 | if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) |
465 | return; | 462 | return; |
466 | for (i = 0; i < tree->pages_per_bnode; i++) { | 463 | for (i = 0; i < tree->pages_per_bnode; i++) { |