1 files changed, 13 insertions, 13 deletions

diff --git a/fs/afs/write.c b/fs/afs/write.c
index dfef94f70667..65de439bdc4f 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -93,10 +93,10 @@ static int afs_fill_page(struct afs_vnode *vnode, struct key *key,
         _enter(",,%llu", (unsigned long long)pos);
 
         i_size = i_size_read(&vnode->vfs_inode);
-        if (pos + PAGE_CACHE_SIZE > i_size)
+        if (pos + PAGE_SIZE > i_size)
                 len = i_size - pos;
         else
-                len = PAGE_CACHE_SIZE;
+                len = PAGE_SIZE;
 
         ret = afs_vnode_fetch_data(vnode, key, pos, len, page);
         if (ret < 0) {
@@ -123,9 +123,9 @@ int afs_write_begin(struct file *file, struct address_space *mapping,
         struct afs_vnode *vnode = AFS_FS_I(file_inode(file));
         struct page *page;
         struct key *key = file->private_data;
-        unsigned from = pos & (PAGE_CACHE_SIZE - 1);
+        unsigned from = pos & (PAGE_SIZE - 1);
         unsigned to = from + len;
-        pgoff_t index = pos >> PAGE_CACHE_SHIFT;
+        pgoff_t index = pos >> PAGE_SHIFT;
         int ret;
 
         _enter("{%x:%u},{%lx},%u,%u",
@@ -151,8 +151,8 @@ int afs_write_begin(struct file *file, struct address_space *mapping,
         *pagep = page;
         /* page won't leak in error case: it eventually gets cleaned off LRU */
 
-        if (!PageUptodate(page) && len != PAGE_CACHE_SIZE) {
-                ret = afs_fill_page(vnode, key, index << PAGE_CACHE_SHIFT, page);
+        if (!PageUptodate(page) && len != PAGE_SIZE) {
+                ret = afs_fill_page(vnode, key, index << PAGE_SHIFT, page);
                 if (ret < 0) {
                         kfree(candidate);
                         _leave(" = %d [prep]", ret);
@@ -266,7 +266,7 @@ int afs_write_end(struct file *file, struct address_space *mapping,
         if (PageDirty(page))
                 _debug("dirtied");
         unlock_page(page);
-        page_cache_release(page);
+        put_page(page);
 
         return copied;
 }
@@ -480,7 +480,7 @@ static int afs_writepages_region(struct address_space *mapping,
 
                 if (page->index > end) {
                         *_next = index;
-                        page_cache_release(page);
+                        put_page(page);
                         _leave(" = 0 [%lx]", *_next);
                         return 0;
                 }
@@ -494,7 +494,7 @@ static int afs_writepages_region(struct address_space *mapping,
 
                 if (page->mapping != mapping) {
                         unlock_page(page);
-                        page_cache_release(page);
+                        put_page(page);
                         continue;
                 }
 
@@ -515,7 +515,7 @@ static int afs_writepages_region(struct address_space *mapping,
 
                 ret = afs_write_back_from_locked_page(wb, page);
                 unlock_page(page);
-                page_cache_release(page);
+                put_page(page);
                 if (ret < 0) {
                         _leave(" = %d", ret);
                         return ret;
@@ -551,13 +551,13 @@ int afs_writepages(struct address_space *mapping,
                                                     &next);
                 mapping->writeback_index = next;
         } else if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
-                end = (pgoff_t)(LLONG_MAX >> PAGE_CACHE_SHIFT);
+                end = (pgoff_t)(LLONG_MAX >> PAGE_SHIFT);
                 ret = afs_writepages_region(mapping, wbc, 0, end, &next);
                 if (wbc->nr_to_write > 0)
                         mapping->writeback_index = next;
         } else {
-                start = wbc->range_start >> PAGE_CACHE_SHIFT;
-                end = wbc->range_end >> PAGE_CACHE_SHIFT;
+                start = wbc->range_start >> PAGE_SHIFT;
+                end = wbc->range_end >> PAGE_SHIFT;
                 ret = afs_writepages_region(mapping, wbc, start, end, &next);
         }