X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fhfs%2Fbtree.c;fp=fs%2Fhfs%2Fbtree.c;h=7bb11edd148891694586da25a7e7926b21973a1b;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=40035799431992573e1e97f87e25e666f1061ddf;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
index 400357994..7bb11edd1 100644
--- a/fs/hfs/btree.c
+++ b/fs/hfs/btree.c
@@ -36,7 +36,8 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
 	tree->inode = iget_locked(sb, id);
 	if (!tree->inode)
 		goto free_tree;
-	BUG_ON(!(tree->inode->i_state & I_NEW));
+	if (!(tree->inode->i_state & I_NEW))
+		BUG();
 	{
 	struct hfs_mdb *mdb = HFS_SB(sb)->mdb;
 	HFS_I(tree->inode)->flags = 0;
@@ -59,7 +60,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
 	unlock_new_inode(tree->inode);
 
 	mapping = tree->inode->i_mapping;
-	page = read_mapping_page(mapping, 0, NULL);
+	page = read_cache_page(mapping, 0, (filler_t *)mapping->a_ops->readpage, NULL);
 	if (IS_ERR(page))
 		goto free_tree;