Merge branch 'PAGE_CACHE_SIZE-removal'

Merge PAGE_CACHE_SIZE removal patches from Kirill Shutemov:
 "PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
  ago with promise that one day it will be possible to implement page
  cache with bigger chunks than PAGE_SIZE.

  This promise never materialized.  And unlikely will.

  Let's stop pretending that pages in page cache are special.  They are
  not.

  The first patch with most changes has been done with coccinelle.  The
  second is manual fixups on top.

  The third patch removes macros definition"

[ I was planning to apply this just before rc2, but then I spaced out,
  so here it is right _after_ rc2 instead.

  As Kirill suggested as a possibility, I could have decided to only
  merge the first two patches, and leave the old interfaces for
  compatibility, but I'd rather get it all done and any out-of-tree
  modules and patches can trivially do the converstion while still also
  working with older kernels, so there is little reason to try to
  maintain the redundant legacy model.    - Linus ]

* PAGE_CACHE_SIZE-removal:
  mm: drop PAGE_CACHE_* and page_cache_{get,release} definition
  mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
  mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros

1 files changed, 7 insertions, 7 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index d01f89d130e0..4e47849d7427 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1062,7 +1062,7 @@ static void btree_invalidatepage(struct page *page, unsigned int offset,
                            (unsigned long long)page_offset(page));
                 ClearPagePrivate(page);
                 set_page_private(page, 0);
-                page_cache_release(page);
+                put_page(page);
         }
 }
 
@@ -1764,7 +1764,7 @@ static int setup_bdi(struct btrfs_fs_info *info, struct backing_dev_info *bdi)
         if (err)
                 return err;
 
-        bdi->ra_pages = VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
+        bdi->ra_pages = VM_MAX_READAHEAD * 1024 / PAGE_SIZE;
         bdi->congested_fn       = btrfs_congested_fn;
         bdi->congested_data     = info;
         bdi->capabilities |= BDI_CAP_CGROUP_WRITEBACK;
@@ -2542,7 +2542,7 @@ int open_ctree(struct super_block *sb,
                 err = ret;
                 goto fail_bdi;
         }
-        fs_info->dirty_metadata_batch = PAGE_CACHE_SIZE *
+        fs_info->dirty_metadata_batch = PAGE_SIZE *
                                         (1 + ilog2(nr_cpu_ids));
 
         ret = percpu_counter_init(&fs_info->delalloc_bytes, 0, GFP_KERNEL);
@@ -2787,7 +2787,7 @@ int open_ctree(struct super_block *sb,
          * flag our filesystem as having big metadata blocks if
          * they are bigger than the page size
          */
-        if (btrfs_super_nodesize(disk_super) > PAGE_CACHE_SIZE) {
+        if (btrfs_super_nodesize(disk_super) > PAGE_SIZE) {
                 if (!(features & BTRFS_FEATURE_INCOMPAT_BIG_METADATA))
                         printk(KERN_INFO "BTRFS: flagging fs with big metadata feature\n");
                 features |= BTRFS_FEATURE_INCOMPAT_BIG_METADATA;
@@ -2837,7 +2837,7 @@ int open_ctree(struct super_block *sb,
 
         fs_info->bdi.ra_pages *= btrfs_super_num_devices(disk_super);
         fs_info->bdi.ra_pages = max(fs_info->bdi.ra_pages,
-                                    SZ_4M / PAGE_CACHE_SIZE);
+                                    SZ_4M / PAGE_SIZE);
 
         tree_root->nodesize = nodesize;
         tree_root->sectorsize = sectorsize;
@@ -4076,9 +4076,9 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
                 ret = -EINVAL;
         }
         /* Only PAGE SIZE is supported yet */
-        if (sectorsize != PAGE_CACHE_SIZE) {
+        if (sectorsize != PAGE_SIZE) {
                 printk(KERN_ERR "BTRFS: sectorsize %llu not supported yet, only support %lu\n",
-                                sectorsize, PAGE_CACHE_SIZE);
+                                sectorsize, PAGE_SIZE);
                 ret = -EINVAL;
         }
         if (!is_power_of_2(nodesize) || nodesize < sectorsize ||