1 files changed, 10 insertions, 10 deletions

diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
index 1ab19e660e69..37cdd955eceb 100644
--- a/fs/hfs/btree.c
+++ b/fs/hfs/btree.c
@@ -116,14 +116,14 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
         }
 
         tree->node_size_shift = ffs(size) - 1;
-        tree->pages_per_bnode = (tree->node_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
+        tree->pages_per_bnode = (tree->node_size + PAGE_SIZE - 1) >> PAGE_SHIFT;
 
         kunmap(page);
-        page_cache_release(page);
+        put_page(page);
         return tree;
 
 fail_page:
-        page_cache_release(page);
+        put_page(page);
 free_inode:
         tree->inode->i_mapping->a_ops = &hfs_aops;
         iput(tree->inode);
@@ -257,9 +257,9 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)
         off = off16;
 
         off += node->page_offset;
-        pagep = node->page + (off >> PAGE_CACHE_SHIFT);
+        pagep = node->page + (off >> PAGE_SHIFT);
         data = kmap(*pagep);
-        off &= ~PAGE_CACHE_MASK;
+        off &= ~PAGE_MASK;
         idx = 0;
 
         for (;;) {
@@ -279,7 +279,7 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)
                                         }
                                 }
                         }
-                        if (++off >= PAGE_CACHE_SIZE) {
+                        if (++off >= PAGE_SIZE) {
                                 kunmap(*pagep);
                                 data = kmap(*++pagep);
                                 off = 0;
@@ -302,9 +302,9 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)
                 len = hfs_brec_lenoff(node, 0, &off16);
                 off = off16;
                 off += node->page_offset;
-                pagep = node->page + (off >> PAGE_CACHE_SHIFT);
+                pagep = node->page + (off >> PAGE_SHIFT);
                 data = kmap(*pagep);
-                off &= ~PAGE_CACHE_MASK;
+                off &= ~PAGE_MASK;
         }
 }
 
@@ -348,9 +348,9 @@ void hfs_bmap_free(struct hfs_bnode *node)
                 len = hfs_brec_lenoff(node, 0, &off);
         }
         off += node->page_offset + nidx / 8;
-        page = node->page[off >> PAGE_CACHE_SHIFT];
+        page = node->page[off >> PAGE_SHIFT];
         data = kmap(page);
-        off &= ~PAGE_CACHE_MASK;
+        off &= ~PAGE_MASK;
         m = 1 << (~nidx & 7);
         byte = data[off];
         if (!(byte & m)) {