Re: [PATCH 70/71] mm: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
From: Guenter Roeck
Date: Sun Mar 20 2016 - 20:00:19 EST
On Sun, Mar 20, 2016 at 09:41:17PM +0300, Kirill A. Shutemov wrote:
> 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>;
>
> - PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
>
> - page_cache_get() -> get_page();
>
> - page_cache_release() -> put_page();
>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
> ---
...
> extern pgoff_t linear_hugepage_index(struct vm_area_struct *vma,
> @@ -425,7 +425,7 @@ static inline pgoff_t linear_page_index(struct vm_area_struct *vma,
> return linear_hugepage_index(vma, address);
> pgoff = (address - vma->vm_start) >> PAGE_SHIFT;
> pgoff += vma->vm_pgoff;
> - return pgoff >> (PAGE_CACHE_SHIFT - PAGE_SHIFT);
> + return pgoff >> (PAGE_SHIFT - PAGE_SHIFT);
^^^^^^^^^^^^^^^^^^^^^^^^^
Guenter