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

Commit e64a782f authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds
Browse files

mm: change __remove_from_page_cache() 



Now we renamed remove_from_page_cache with delete_from_page_cache.  As
consistency of __remove_from_swap_cache and remove_from_swap_cache, we
change internal page cache handling function name, too.

Signed-off-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Cc: Christoph Hellwig <hch@infradead.org>
Acked-by: default avatarHugh Dickins <hughd@google.com>
Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 702cfbf9

include/linux/pagemap.h

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping, 
int add_to_page_cache_lru(struct page *page, struct address_space *mapping,

				pgoff_t index, gfp_t gfp_mask);

extern void delete_from_page_cache(struct page *page);

extern void __remove_from_page_cache(struct page *page);

extern void __delete_from_page_cache(struct page *page);

int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask);



/*

mm/filemap.c

+4 −4
Original line number Diff line number Diff line
@@ -108,11 +108,11 @@ 
 */



/*

 * Remove a page from the page cache and free it. Caller has to make

 * Delete a page from the page cache and free it. Caller has to make

 * sure the page is locked and that nobody else uses it - or that usage

 * is safe.  The caller must hold the mapping's tree_lock.

 */

void __remove_from_page_cache(struct page *page)

void __delete_from_page_cache(struct page *page)

{

	struct address_space *mapping = page->mapping;
@@ -154,7 +154,7 @@ void delete_from_page_cache(struct page *page) 


	freepage = mapping->a_ops->freepage;

	spin_lock_irq(&mapping->tree_lock);

	__remove_from_page_cache(page);

	__delete_from_page_cache(page);

	spin_unlock_irq(&mapping->tree_lock);

	mem_cgroup_uncharge_cache_page(page);
@@ -444,7 +444,7 @@ int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask) 
		new->index = offset;



		spin_lock_irq(&mapping->tree_lock);

		__remove_from_page_cache(old);

		__delete_from_page_cache(old);

		error = radix_tree_insert(&mapping->page_tree, offset, new);

		BUG_ON(error);

		mapping->nrpages++;

mm/memory-failure.c

+1 −1
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags) 


	/*

	 * Now take care of user space mappings.

	 * Abort on fail: __remove_from_page_cache() assumes unmapped page.

	 * Abort on fail: __delete_from_page_cache() assumes unmapped page.

	 */

	if (hwpoison_user_mappings(p, pfn, trapno) != SWAP_SUCCESS) {

		printk(KERN_ERR "MCE %#lx: cannot unmap page, give up\n", pfn);

mm/truncate.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ invalidate_complete_page2(struct address_space *mapping, struct page *page) 


	clear_page_mlock(page);

	BUG_ON(page_has_private(page));

	__remove_from_page_cache(page);

	__delete_from_page_cache(page);

	spin_unlock_irq(&mapping->tree_lock);

	mem_cgroup_uncharge_cache_page(page);

mm/vmscan.c

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static int __remove_mapping(struct address_space *mapping, struct page *page) 


		freepage = mapping->a_ops->freepage;



		__remove_from_page_cache(page);

		__delete_from_page_cache(page);

		spin_unlock_irq(&mapping->tree_lock);

		mem_cgroup_uncharge_cache_page(page);