1 files changed, 11 insertions, 11 deletions

diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 64026e53722a..d09cb4cdd09f 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -286,7 +286,7 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg,
                 pg = virt_to_page(addr);
                 offset = offset_in_page(addr);
                 sg_set_page(&sg[i], pg, 0, offset);
-                remainder_of_page = PAGE_CACHE_SIZE - offset;
+                remainder_of_page = PAGE_SIZE - offset;
                 if (size >= remainder_of_page) {
                         sg[i].length = remainder_of_page;
                         addr += remainder_of_page;
@@ -400,7 +400,7 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,
                                     struct page *page)
 {
         return ecryptfs_lower_header_size(crypt_stat) +
-               ((loff_t)page->index << PAGE_CACHE_SHIFT);
+               ((loff_t)page->index << PAGE_SHIFT);
 }
 
 /**
@@ -428,7 +428,7 @@ static int crypt_extent(struct ecryptfs_crypt_stat *crypt_stat,
         size_t extent_size = crypt_stat->extent_size;
         int rc;
 
-        extent_base = (((loff_t)page_index) * (PAGE_CACHE_SIZE / extent_size));
+        extent_base = (((loff_t)page_index) * (PAGE_SIZE / extent_size));
         rc = ecryptfs_derive_iv(extent_iv, crypt_stat,
                                 (extent_base + extent_offset));
         if (rc) {
@@ -498,7 +498,7 @@ int ecryptfs_encrypt_page(struct page *page)
         }
 
         for (extent_offset = 0;
-             extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size);
+             extent_offset < (PAGE_SIZE / crypt_stat->extent_size);
              extent_offset++) {
                 rc = crypt_extent(crypt_stat, enc_extent_page, page,
                                   extent_offset, ENCRYPT);
@@ -512,7 +512,7 @@ int ecryptfs_encrypt_page(struct page *page)
         lower_offset = lower_offset_for_page(crypt_stat, page);
         enc_extent_virt = kmap(enc_extent_page);
         rc = ecryptfs_write_lower(ecryptfs_inode, enc_extent_virt, lower_offset,
-                                  PAGE_CACHE_SIZE);
+                                  PAGE_SIZE);
         kunmap(enc_extent_page);
         if (rc < 0) {
                 ecryptfs_printk(KERN_ERR,
@@ -560,7 +560,7 @@ int ecryptfs_decrypt_page(struct page *page)
 
         lower_offset = lower_offset_for_page(crypt_stat, page);
         page_virt = kmap(page);
-        rc = ecryptfs_read_lower(page_virt, lower_offset, PAGE_CACHE_SIZE,
+        rc = ecryptfs_read_lower(page_virt, lower_offset, PAGE_SIZE,
                                  ecryptfs_inode);
         kunmap(page);
         if (rc < 0) {
@@ -571,7 +571,7 @@ int ecryptfs_decrypt_page(struct page *page)
         }
 
         for (extent_offset = 0;
-             extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size);
+             extent_offset < (PAGE_SIZE / crypt_stat->extent_size);
              extent_offset++) {
                 rc = crypt_extent(crypt_stat, page, page,
                                   extent_offset, DECRYPT);
@@ -659,11 +659,11 @@ void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat)
         if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR)
                 crypt_stat->metadata_size = ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE;
         else {
-                if (PAGE_CACHE_SIZE <= ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE)
+                if (PAGE_SIZE <= ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE)
                         crypt_stat->metadata_size =
                                 ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE;
                 else
-                        crypt_stat->metadata_size = PAGE_CACHE_SIZE;
+                        crypt_stat->metadata_size = PAGE_SIZE;
         }
 }
 
@@ -1442,7 +1442,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
                                                 ECRYPTFS_VALIDATE_HEADER_SIZE);
         if (rc) {
                 /* metadata is not in the file header, so try xattrs */
-                memset(page_virt, 0, PAGE_CACHE_SIZE);
+                memset(page_virt, 0, PAGE_SIZE);
                 rc = ecryptfs_read_xattr_region(page_virt, ecryptfs_inode);
                 if (rc) {
                         printk(KERN_DEBUG "Valid eCryptfs headers not found in "
@@ -1475,7 +1475,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
         }
 out:
         if (page_virt) {
-                memset(page_virt, 0, PAGE_CACHE_SIZE);
+                memset(page_virt, 0, PAGE_SIZE);
                 kmem_cache_free(ecryptfs_header_cache, page_virt);
         }
         return rc;