git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
hfs
/
bnode.c
diff --git
a/fs/hfs/bnode.c
b/fs/hfs/bnode.c
index
1e44dcf
..
a7a7d77
100644
(file)
--- a/
fs/hfs/bnode.c
+++ b/
fs/hfs/bnode.c
@@
-306,7
+306,8
@@
void hfs_bnode_unhash(struct hfs_bnode *node)
for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)];
*p && *p != node; p = &(*p)->next_hash)
;
for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)];
*p && *p != node; p = &(*p)->next_hash)
;
- BUG_ON(!*p);
+ if (!*p)
+ BUG();
*p = node->next_hash;
node->tree->node_hash_cnt--;
}
*p = node->next_hash;
node->tree->node_hash_cnt--;
}
@@
-414,7
+415,8
@@
struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num)
spin_lock(&tree->hash_lock);
node = hfs_bnode_findhash(tree, num);
spin_unlock(&tree->hash_lock);
spin_lock(&tree->hash_lock);
node = hfs_bnode_findhash(tree, num);
spin_unlock(&tree->hash_lock);
- BUG_ON(node);
+ if (node)
+ BUG();
node = __hfs_bnode_create(tree, num);
if (!node)
return ERR_PTR(-ENOMEM);
node = __hfs_bnode_create(tree, num);
if (!node)
return ERR_PTR(-ENOMEM);
@@
-457,7
+459,8
@@
void hfs_bnode_put(struct hfs_bnode *node)
dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n",
node->tree->cnid, node->this, atomic_read(&node->refcnt));
dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n",
node->tree->cnid, node->this, atomic_read(&node->refcnt));
- BUG_ON(!atomic_read(&node->refcnt));
+ if (!atomic_read(&node->refcnt))
+ BUG();
if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock))
return;
for (i = 0; i < tree->pages_per_bnode; i++) {
if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock))
return;
for (i = 0; i < tree->pages_per_bnode; i++) {