1 files changed, 11 insertions, 11 deletions

diff --git a/fs/mpage.c b/fs/mpage.c
index 6bd9fd90964e..eedc644b78d7 100644
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -107,7 +107,7 @@ map_buffer_to_page(struct page *page, struct buffer_head *bh, int page_block)
                  * don't make any buffers if there is only one buffer on
                  * the page and the page just needs to be set up to date
                  */
-                if (inode->i_blkbits == PAGE_CACHE_SHIFT && 
+                if (inode->i_blkbits == PAGE_SHIFT &&
                     buffer_uptodate(bh)) {
                         SetPageUptodate(page);    
                         return;
@@ -145,7 +145,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,
 {
         struct inode *inode = page->mapping->host;
         const unsigned blkbits = inode->i_blkbits;
-        const unsigned blocks_per_page = PAGE_CACHE_SIZE >> blkbits;
+        const unsigned blocks_per_page = PAGE_SIZE >> blkbits;
         const unsigned blocksize = 1 << blkbits;
         sector_t block_in_file;
         sector_t last_block;
@@ -162,7 +162,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,
         if (page_has_buffers(page))
                 goto confused;
 
-        block_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits);
+        block_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits);
         last_block = block_in_file + nr_pages * blocks_per_page;
         last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits;
         if (last_block > last_block_in_file)
@@ -249,7 +249,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,
         }
 
         if (first_hole != blocks_per_page) {
-                zero_user_segment(page, first_hole << blkbits, PAGE_CACHE_SIZE);
+                zero_user_segment(page, first_hole << blkbits, PAGE_SIZE);
                 if (first_hole == 0) {
                         SetPageUptodate(page);
                         unlock_page(page);
@@ -331,7 +331,7 @@ confused:
  *
  * then this code just gives up and calls the buffer_head-based read function.
  * It does handle a page which has holes at the end - that is a common case:
- * the end-of-file on blocksize < PAGE_CACHE_SIZE setups.
+ * the end-of-file on blocksize < PAGE_SIZE setups.
  *
  * BH_Boundary explanation:
  *
@@ -380,7 +380,7 @@ mpage_readpages(struct address_space *mapping, struct list_head *pages,
                                         &first_logical_block,
                                         get_block, gfp);
                 }
-                page_cache_release(page);
+                put_page(page);
         }
         BUG_ON(!list_empty(pages));
         if (bio)
@@ -472,7 +472,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
         struct inode *inode = page->mapping->host;
         const unsigned blkbits = inode->i_blkbits;
         unsigned long end_index;
-        const unsigned blocks_per_page = PAGE_CACHE_SIZE >> blkbits;
+        const unsigned blocks_per_page = PAGE_SIZE >> blkbits;
         sector_t last_block;
         sector_t block_in_file;
         sector_t blocks[MAX_BUF_PER_PAGE];
@@ -542,7 +542,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
          * The page has no buffers: map it to disk
          */
         BUG_ON(!PageUptodate(page));
-        block_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits);
+        block_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits);
         last_block = (i_size - 1) >> blkbits;
         map_bh.b_page = page;
         for (page_block = 0; page_block < blocks_per_page; ) {
@@ -574,7 +574,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
         first_unmapped = page_block;
 
 page_is_mapped:
-        end_index = i_size >> PAGE_CACHE_SHIFT;
+        end_index = i_size >> PAGE_SHIFT;
         if (page->index >= end_index) {
                 /*
                  * The page straddles i_size.  It must be zeroed out on each
@@ -584,11 +584,11 @@ page_is_mapped:
                  * is zeroed when mapped, and writes to that region are not
                  * written out to the file."
                  */
-                unsigned offset = i_size & (PAGE_CACHE_SIZE - 1);
+                unsigned offset = i_size & (PAGE_SIZE - 1);
 
                 if (page->index > end_index || !offset)
                         goto confused;
-                zero_user_segment(page, offset, PAGE_CACHE_SIZE);
+                zero_user_segment(page, offset, PAGE_SIZE);
         }
 
         /*