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, 13 insertions, 13 deletions

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index ebb5e37455a0..cbece1221417 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -897,7 +897,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
                 return err;
         }
 
-        page_cache_get(newpage);
+        get_page(newpage);
 
         if (!(buf->flags & PIPE_BUF_FLAG_LRU))
                 lru_cache_add_file(newpage);
@@ -912,12 +912,12 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
 
         if (err) {
                 unlock_page(newpage);
-                page_cache_release(newpage);
+                put_page(newpage);
                 return err;
         }
 
         unlock_page(oldpage);
-        page_cache_release(oldpage);
+        put_page(oldpage);
         cs->len = 0;
 
         return 0;
@@ -951,7 +951,7 @@ static int fuse_ref_page(struct fuse_copy_state *cs, struct page *page,
         fuse_copy_finish(cs);
 
         buf = cs->pipebufs;
-        page_cache_get(page);
+        get_page(page);
         buf->page = page;
         buf->offset = offset;
         buf->len = count;
@@ -1435,7 +1435,7 @@ out_unlock:
 
 out:
         for (; page_nr < cs.nr_segs; page_nr++)
-                page_cache_release(bufs[page_nr].page);
+                put_page(bufs[page_nr].page);
 
         kfree(bufs);
         return ret;
@@ -1632,8 +1632,8 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size,
                 goto out_up_killsb;
 
         mapping = inode->i_mapping;
-        index = outarg.offset >> PAGE_CACHE_SHIFT;
-        offset = outarg.offset & ~PAGE_CACHE_MASK;
+        index = outarg.offset >> PAGE_SHIFT;
+        offset = outarg.offset & ~PAGE_MASK;
         file_size = i_size_read(inode);
         end = outarg.offset + outarg.size;
         if (end > file_size) {
@@ -1652,13 +1652,13 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size,
                 if (!page)
                         goto out_iput;
 
-                this_num = min_t(unsigned, num, PAGE_CACHE_SIZE - offset);
+                this_num = min_t(unsigned, num, PAGE_SIZE - offset);
                 err = fuse_copy_page(cs, &page, offset, this_num, 0);
                 if (!err && offset == 0 &&
-                    (this_num == PAGE_CACHE_SIZE || file_size == end))
+                    (this_num == PAGE_SIZE || file_size == end))
                         SetPageUptodate(page);
                 unlock_page(page);
-                page_cache_release(page);
+                put_page(page);
 
                 if (err)
                         goto out_iput;
@@ -1697,7 +1697,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode,
         size_t total_len = 0;
         int num_pages;
 
-        offset = outarg->offset & ~PAGE_CACHE_MASK;
+        offset = outarg->offset & ~PAGE_MASK;
         file_size = i_size_read(inode);
 
         num = outarg->size;
@@ -1720,7 +1720,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode,
         req->page_descs[0].offset = offset;
         req->end = fuse_retrieve_end;
 
-        index = outarg->offset >> PAGE_CACHE_SHIFT;
+        index = outarg->offset >> PAGE_SHIFT;
 
         while (num && req->num_pages < num_pages) {
                 struct page *page;
@@ -1730,7 +1730,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode,
                 if (!page)
                         break;
 
-                this_num = min_t(unsigned, num, PAGE_CACHE_SIZE - offset);
+                this_num = min_t(unsigned, num, PAGE_SIZE - offset);
                 req->pages[req->num_pages] = page;
                 req->page_descs[req->num_pages].length = this_num;
                 req->num_pages++;