1 files changed, 12 insertions, 12 deletions

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 39dbdcbf4d13..4678f03e878e 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -703,7 +703,7 @@ static int scrub_fixup_readpage(u64 inum, u64 offset, u64 root, void *fixup_ctx)
         if (IS_ERR(inode))
                 return PTR_ERR(inode);
 
-        index = offset >> PAGE_CACHE_SHIFT;
+        index = offset >> PAGE_SHIFT;
 
         page = find_or_create_page(inode->i_mapping, index, GFP_NOFS);
         if (!page) {
@@ -1636,7 +1636,7 @@ static int scrub_write_page_to_dev_replace(struct scrub_block *sblock,
         if (spage->io_error) {
                 void *mapped_buffer = kmap_atomic(spage->page);
 
-                memset(mapped_buffer, 0, PAGE_CACHE_SIZE);
+                memset(mapped_buffer, 0, PAGE_SIZE);
                 flush_dcache_page(spage->page);
                 kunmap_atomic(mapped_buffer);
         }
@@ -4294,8 +4294,8 @@ static int copy_nocow_pages_for_inode(u64 inum, u64 offset, u64 root,
                 goto out;
         }
 
-        while (len >= PAGE_CACHE_SIZE) {
-                index = offset >> PAGE_CACHE_SHIFT;
+        while (len >= PAGE_SIZE) {
+                index = offset >> PAGE_SHIFT;
 again:
                 page = find_or_create_page(inode->i_mapping, index, GFP_NOFS);
                 if (!page) {
@@ -4326,7 +4326,7 @@ again:
                          */
                         if (page->mapping != inode->i_mapping) {
                                 unlock_page(page);
-                                page_cache_release(page);
+                                put_page(page);
                                 goto again;
                         }
                         if (!PageUptodate(page)) {
@@ -4348,15 +4348,15 @@ again:
                         ret = err;
 next_page:
                 unlock_page(page);
-                page_cache_release(page);
+                put_page(page);
 
                 if (ret)
                         break;
 
-                offset += PAGE_CACHE_SIZE;
-                physical_for_dev_replace += PAGE_CACHE_SIZE;
-                nocow_ctx_logical += PAGE_CACHE_SIZE;
-                len -= PAGE_CACHE_SIZE;
+                offset += PAGE_SIZE;
+                physical_for_dev_replace += PAGE_SIZE;
+                nocow_ctx_logical += PAGE_SIZE;
+                len -= PAGE_SIZE;
         }
         ret = COPY_COMPLETE;
 out:
@@ -4390,8 +4390,8 @@ static int write_page_nocow(struct scrub_ctx *sctx,
         bio->bi_iter.bi_size = 0;
         bio->bi_iter.bi_sector = physical_for_dev_replace >> 9;
         bio->bi_bdev = dev->bdev;
-        ret = bio_add_page(bio, page, PAGE_CACHE_SIZE, 0);
-        if (ret != PAGE_CACHE_SIZE) {
+        ret = bio_add_page(bio, page, PAGE_SIZE, 0);
+        if (ret != PAGE_SIZE) {
 leave_with_eio:
                 bio_put(bio);
                 btrfs_dev_stat_inc_and_print(dev, BTRFS_DEV_STAT_WRITE_ERRS);