1 files changed, 7 insertions, 7 deletions

diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
index 09fe622274e4..158a3a39f82d 100644
--- a/fs/ecryptfs/read_write.c
+++ b/fs/ecryptfs/read_write.c
@@ -74,7 +74,7 @@ int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode,
         loff_t offset;
         int rc;
 
-        offset = ((((loff_t)page_for_lower->index) << PAGE_CACHE_SHIFT)
+        offset = ((((loff_t)page_for_lower->index) << PAGE_SHIFT)
                   + offset_in_page);
         virt = kmap(page_for_lower);
         rc = ecryptfs_write_lower(ecryptfs_inode, virt, offset, size);
@@ -123,9 +123,9 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
         else
                 pos = offset;
         while (pos < (offset + size)) {
-                pgoff_t ecryptfs_page_idx = (pos >> PAGE_CACHE_SHIFT);
-                size_t start_offset_in_page = (pos & ~PAGE_CACHE_MASK);
-                size_t num_bytes = (PAGE_CACHE_SIZE - start_offset_in_page);
+                pgoff_t ecryptfs_page_idx = (pos >> PAGE_SHIFT);
+                size_t start_offset_in_page = (pos & ~PAGE_MASK);
+                size_t num_bytes = (PAGE_SIZE - start_offset_in_page);
                 loff_t total_remaining_bytes = ((offset + size) - pos);
 
                 if (fatal_signal_pending(current)) {
@@ -165,7 +165,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
                          * Fill in zero values to the end of the page */
                         memset(((char *)ecryptfs_page_virt
                                 + start_offset_in_page), 0,
-                                PAGE_CACHE_SIZE - start_offset_in_page);
+                                PAGE_SIZE - start_offset_in_page);
                 }
 
                 /* pos >= offset, we are now writing the data request */
@@ -186,7 +186,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
                                                 ecryptfs_page,
                                                 start_offset_in_page,
                                                 data_offset);
-                page_cache_release(ecryptfs_page);
+                put_page(ecryptfs_page);
                 if (rc) {
                         printk(KERN_ERR "%s: Error encrypting "
                                "page; rc = [%d]\n", __func__, rc);
@@ -262,7 +262,7 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,
         loff_t offset;
         int rc;
 
-        offset = ((((loff_t)page_index) << PAGE_CACHE_SHIFT) + offset_in_page);
+        offset = ((((loff_t)page_index) << PAGE_SHIFT) + offset_in_page);
         virt = kmap(page_for_ecryptfs);
         rc = ecryptfs_read_lower(virt, offset, size, ecryptfs_inode);
         if (rc > 0)