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

diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
index 6b8b92b19cec..e08f064e4bd7 100644
--- a/fs/nilfs2/dir.c
+++ b/fs/nilfs2/dir.c
@@ -58,7 +58,7 @@ static inline unsigned nilfs_chunk_size(struct inode *inode)
 static inline void nilfs_put_page(struct page *page)
 {
         kunmap(page);
-        page_cache_release(page);
+        put_page(page);
 }
 
 /*
@@ -69,9 +69,9 @@ static unsigned nilfs_last_byte(struct inode *inode, unsigned long page_nr)
 {
         unsigned last_byte = inode->i_size;
 
-        last_byte -= page_nr << PAGE_CACHE_SHIFT;
-        if (last_byte > PAGE_CACHE_SIZE)
-                last_byte = PAGE_CACHE_SIZE;
+        last_byte -= page_nr << PAGE_SHIFT;
+        if (last_byte > PAGE_SIZE)
+                last_byte = PAGE_SIZE;
         return last_byte;
 }
 
@@ -109,12 +109,12 @@ static void nilfs_check_page(struct page *page)
         unsigned chunk_size = nilfs_chunk_size(dir);
         char *kaddr = page_address(page);
         unsigned offs, rec_len;
-        unsigned limit = PAGE_CACHE_SIZE;
+        unsigned limit = PAGE_SIZE;
         struct nilfs_dir_entry *p;
         char *error;
 
-        if ((dir->i_size >> PAGE_CACHE_SHIFT) == page->index) {
-                limit = dir->i_size & ~PAGE_CACHE_MASK;
+        if ((dir->i_size >> PAGE_SHIFT) == page->index) {
+                limit = dir->i_size & ~PAGE_MASK;
                 if (limit & (chunk_size - 1))
                         goto Ebadsize;
                 if (!limit)
@@ -161,7 +161,7 @@ Espan:
 bad_entry:
         nilfs_error(sb, "nilfs_check_page", "bad entry in directory #%lu: %s - "
                     "offset=%lu, inode=%lu, rec_len=%d, name_len=%d",
-                    dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs,
+                    dir->i_ino, error, (page->index<<PAGE_SHIFT)+offs,
                     (unsigned long) le64_to_cpu(p->inode),
                     rec_len, p->name_len);
         goto fail;
@@ -170,7 +170,7 @@ Eend:
         nilfs_error(sb, "nilfs_check_page",
                     "entry in directory #%lu spans the page boundary"
                     "offset=%lu, inode=%lu",
-                    dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,
+                    dir->i_ino, (page->index<<PAGE_SHIFT)+offs,
                     (unsigned long) le64_to_cpu(p->inode));
 fail:
         SetPageChecked(page);
@@ -256,8 +256,8 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx)
         loff_t pos = ctx->pos;
         struct inode *inode = file_inode(file);
         struct super_block *sb = inode->i_sb;
-        unsigned int offset = pos & ~PAGE_CACHE_MASK;
-        unsigned long n = pos >> PAGE_CACHE_SHIFT;
+        unsigned int offset = pos & ~PAGE_MASK;
+        unsigned long n = pos >> PAGE_SHIFT;
         unsigned long npages = dir_pages(inode);
 /*      unsigned chunk_mask = ~(nilfs_chunk_size(inode)-1); */
 
@@ -272,7 +272,7 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx)
                 if (IS_ERR(page)) {
                         nilfs_error(sb, __func__, "bad page in #%lu",
                                     inode->i_ino);
-                        ctx->pos += PAGE_CACHE_SIZE - offset;
+                        ctx->pos += PAGE_SIZE - offset;
                         return -EIO;
                 }
                 kaddr = page_address(page);
@@ -361,7 +361,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr,
                 if (++n >= npages)
                         n = 0;
                 /* next page is past the blocks we've got */
-                if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) {
+                if (unlikely(n > (dir->i_blocks >> (PAGE_SHIFT - 9)))) {
                         nilfs_error(dir->i_sb, __func__,
                                "dir %lu size %lld exceeds block count %llu",
                                dir->i_ino, dir->i_size,
@@ -401,7 +401,7 @@ ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr)
         if (de) {
                 res = le64_to_cpu(de->inode);
                 kunmap(page);
-                page_cache_release(page);
+                put_page(page);
         }
         return res;
 }
@@ -460,7 +460,7 @@ int nilfs_add_link(struct dentry *dentry, struct inode *inode)
                 kaddr = page_address(page);
                 dir_end = kaddr + nilfs_last_byte(dir, n);
                 de = (struct nilfs_dir_entry *)kaddr;
-                kaddr += PAGE_CACHE_SIZE - reclen;
+                kaddr += PAGE_SIZE - reclen;
                 while ((char *)de <= kaddr) {
                         if ((char *)de == dir_end) {
                                 /* We hit i_size */
@@ -603,7 +603,7 @@ int nilfs_make_empty(struct inode *inode, struct inode *parent)
         kunmap_atomic(kaddr);
         nilfs_commit_chunk(page, mapping, 0, chunk_size);
 fail:
-        page_cache_release(page);
+        put_page(page);
         return err;
 }