mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros

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.

We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE.  And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.

Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.

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

The changes are pretty straight-forward:

 - <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;

 - <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;

 - PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};

 - page_cache_get() -> get_page();

 - page_cache_release() -> put_page();

This patch contains automated changes generated with coccinelle using
script below.  For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.

The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.

There are few places in the code where coccinelle didn't reach.  I'll
fix them manually in a separate patch.  Comments and documentation also
will be addressed with the separate patch.

virtual patch

@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E

@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E

@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT

@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE

@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK

@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)

@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)

@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 10 deletions

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 89bf093d342a..be01095b97ae 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -320,7 +320,7 @@ static int nfs_want_read_modify_write(struct file *file, struct page *page,
                         loff_t pos, unsigned len)
 {
         unsigned int pglen = nfs_page_length(page);
-        unsigned int offset = pos & (PAGE_CACHE_SIZE - 1);
+        unsigned int offset = pos & (PAGE_SIZE - 1);
         unsigned int end = offset + len;
 
         if (pnfs_ld_read_whole_page(file->f_mapping->host)) {
@@ -351,7 +351,7 @@ static int nfs_write_begin(struct file *file, struct address_space *mapping,
                         struct page **pagep, void **fsdata)
 {
         int ret;
-        pgoff_t index = pos >> PAGE_CACHE_SHIFT;
+        pgoff_t index = pos >> PAGE_SHIFT;
         struct page *page;
         int once_thru = 0;
 
@@ -380,12 +380,12 @@ start:
         ret = nfs_flush_incompatible(file, page);
         if (ret) {
                 unlock_page(page);
-                page_cache_release(page);
+                put_page(page);
         } else if (!once_thru &&
                    nfs_want_read_modify_write(file, page, pos, len)) {
                 once_thru = 1;
                 ret = nfs_readpage(file, page);
-                page_cache_release(page);
+                put_page(page);
                 if (!ret)
                         goto start;
         }
@@ -396,7 +396,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
                         loff_t pos, unsigned len, unsigned copied,
                         struct page *page, void *fsdata)
 {
-        unsigned offset = pos & (PAGE_CACHE_SIZE - 1);
+        unsigned offset = pos & (PAGE_SIZE - 1);
         struct nfs_open_context *ctx = nfs_file_open_context(file);
         int status;
 
@@ -413,20 +413,20 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
 
                 if (pglen == 0) {
                         zero_user_segments(page, 0, offset,
-                                        end, PAGE_CACHE_SIZE);
+                                        end, PAGE_SIZE);
                         SetPageUptodate(page);
                 } else if (end >= pglen) {
-                        zero_user_segment(page, end, PAGE_CACHE_SIZE);
+                        zero_user_segment(page, end, PAGE_SIZE);
                         if (offset == 0)
                                 SetPageUptodate(page);
                 } else
-                        zero_user_segment(page, pglen, PAGE_CACHE_SIZE);
+                        zero_user_segment(page, pglen, PAGE_SIZE);
         }
 
         status = nfs_updatepage(file, page, offset, copied);
 
         unlock_page(page);
-        page_cache_release(page);
+        put_page(page);
 
         if (status < 0)
                 return status;
@@ -454,7 +454,7 @@ static void nfs_invalidate_page(struct page *page, unsigned int offset,
         dfprintk(PAGECACHE, "NFS: invalidate_page(%p, %u, %u)\n",
                  page, offset, length);
 
-        if (offset != 0 || length < PAGE_CACHE_SIZE)
+        if (offset != 0 || length < PAGE_SIZE)
                 return;
         /* Cancel any unstarted writes on this page */
         nfs_wb_page_cancel(page_file_mapping(page)->host, page);