Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e64a782fec684c29a8204c51b3cb554dce588592

Authored by Minchan Kim
Committed by Linus Torvalds
1 parent 702cfbf93a
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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: Minchan Kim <minchan.kim@gmail.com>
Cc: Christoph Hellwig <hch@infradead.org>
Acked-by: Hugh Dickins <hughd@google.com>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 5 changed files with 8 additions and 8 deletions Side-by-side Diff

include/linux/pagemap.h
Diff comments   View file @ e64a782
... ... @@ -456,7 +456,7 @@
456 456 int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
457 457 pgoff_t index, gfp_t gfp_mask);
458 458 extern void delete_from_page_cache(struct page *page);
459   -extern void __remove_from_page_cache(struct page *page);
  459 +extern void __delete_from_page_cache(struct page *page);
460 460 int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask);
461 461  
462 462 /*
... ... @@ -108,11 +108,11 @@
108 108 */
109 109  
110 110 /*
111   - * Remove a page from the page cache and free it. Caller has to make
  111 + * Delete a page from the page cache and free it. Caller has to make
112 112 * sure the page is locked and that nobody else uses it - or that usage
113 113 * is safe. The caller must hold the mapping's tree_lock.
114 114 */
115   -void __remove_from_page_cache(struct page *page)
  115 +void __delete_from_page_cache(struct page *page)
116 116 {
117 117 struct address_space *mapping = page->mapping;
118 118  
... ... @@ -154,7 +154,7 @@
154 154  
155 155 freepage = mapping->a_ops->freepage;
156 156 spin_lock_irq(&mapping->tree_lock);
157   - __remove_from_page_cache(page);
  157 + __delete_from_page_cache(page);
158 158 spin_unlock_irq(&mapping->tree_lock);
159 159 mem_cgroup_uncharge_cache_page(page);
160 160  
... ... @@ -444,7 +444,7 @@
444 444 new->index = offset;
445 445  
446 446 spin_lock_irq(&mapping->tree_lock);
447   - __remove_from_page_cache(old);
  447 + __delete_from_page_cache(old);
448 448 error = radix_tree_insert(&mapping->page_tree, offset, new);
449 449 BUG_ON(error);
450 450 mapping->nrpages++;
... ... @@ -1130,7 +1130,7 @@
1130 1130  
1131 1131 /*
1132 1132 * Now take care of user space mappings.
1133   - * Abort on fail: __remove_from_page_cache() assumes unmapped page.
  1133 + * Abort on fail: __delete_from_page_cache() assumes unmapped page.
1134 1134 */
1135 1135 if (hwpoison_user_mappings(p, pfn, trapno) != SWAP_SUCCESS) {
1136 1136 printk(KERN_ERR "MCE %#lx: cannot unmap page, give up\n", pfn);
... ... @@ -388,7 +388,7 @@
388 388  
389 389 clear_page_mlock(page);
390 390 BUG_ON(page_has_private(page));
391   - __remove_from_page_cache(page);
  391 + __delete_from_page_cache(page);
392 392 spin_unlock_irq(&mapping->tree_lock);
393 393 mem_cgroup_uncharge_cache_page(page);
394 394  
... ... @@ -514,7 +514,7 @@
514 514  
515 515 freepage = mapping->a_ops->freepage;
516 516  
517   - __remove_from_page_cache(page);
  517 + __delete_from_page_cache(page);
518 518 spin_unlock_irq(&mapping->tree_lock);
519 519 mem_cgroup_uncharge_cache_page(page);
520 520