Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a2d057e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9735a227 1fa64f19

Documentation/filesystems/cramfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ the update lasts only as long as the inode is cached in memory, after 
which the timestamp reverts to 1970, i.e. moves backwards in time.



Currently, cramfs must be written and read with architectures of the

same endianness, and can be read only by kernels with PAGE_CACHE_SIZE

same endianness, and can be read only by kernels with PAGE_SIZE

== 4096.  At least the latter of these is a bug, but it hasn't been

decided what the best fix is.  For the moment if you have larger pages

you can just change the #define in mkcramfs.c, so long as you don't

Documentation/filesystems/tmpfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ size: The limit of allocated bytes for this tmpfs instance. The 
           default is half of your physical RAM without swap. If you

           oversize your tmpfs instances the machine will deadlock

           since the OOM handler will not be able to free that memory.

nr_blocks: The same as size, but in blocks of PAGE_CACHE_SIZE.

nr_blocks: The same as size, but in blocks of PAGE_SIZE.

nr_inodes: The maximum number of inodes for this instance. The default

           is half of the number of your physical RAM pages, or (on a

           machine with highmem) the number of lowmem RAM pages,

Documentation/filesystems/vfs.txt

+2 −2
Original line number Diff line number Diff line
@@ -708,9 +708,9 @@ struct address_space_operations { 
	from the address space.  This generally corresponds to either a

	truncation, punch hole  or a complete invalidation of the address

	space (in the latter case 'offset' will always be 0 and 'length'

	will be PAGE_CACHE_SIZE). Any private data associated with the page

	will be PAGE_SIZE). Any private data associated with the page

	should be updated to reflect this truncation.  If offset is 0 and

	length is PAGE_CACHE_SIZE, then the private data should be released,

	length is PAGE_SIZE, then the private data should be released,

	because the page must be able to be completely discarded.  This may

	be done by calling the ->releasepage function, but in this case the

	release MUST succeed.

arch/arc/mm/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ void flush_dcache_page(struct page *page) 


		/* kernel reading from page with U-mapping */

		phys_addr_t paddr = (unsigned long)page_address(page);

		unsigned long vaddr = page->index << PAGE_CACHE_SHIFT;

		unsigned long vaddr = page->index << PAGE_SHIFT;



		if (addr_not_cache_congruent(paddr, vaddr))

			__flush_dcache_page(paddr, vaddr);

arch/arm/mm/flush.c

+2 −2
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ void __flush_dcache_page(struct address_space *mapping, struct page *page) 
	 */

	if (mapping && cache_is_vipt_aliasing())

		flush_pfn_alias(page_to_pfn(page),

				page->index << PAGE_CACHE_SHIFT);

				page->index << PAGE_SHIFT);

}



static void __flush_dcache_aliases(struct address_space *mapping, struct page *page)
@@ -250,7 +250,7 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p 
	 *   data in the current VM view associated with this page.

	 * - aliasing VIPT: we only need to find one mapping of this page.

	 */

	pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);

	pgoff = page->index;



	flush_dcache_mmap_lock(mapping);

	vma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) {