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 13231dd..a7a7d77 100644 (file)
--- a/fs/hfs/bnode.c
+++ b/fs/hfs/bnode.c
@@ -280,7 +280,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
        block = off >> PAGE_CACHE_SHIFT;
        node->page_offset = off & ~PAGE_CACHE_MASK;
        for (i = 0; i < tree->pages_per_bnode; i++) {
-               page = read_mapping_page(mapping, block++, NULL);
+               page = read_cache_page(mapping, block++, (filler_t *)mapping->a_ops->readpage, NULL);
                if (IS_ERR(page))
                        goto fail;
                if (PageError(page)) {
@@ -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)
                ;
-       BUG_ON(!*p);
+       if (!*p)
+               BUG();
        *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);
-       BUG_ON(node);
+       if (node)
+               BUG();
        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));
-               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++) {