Commit 702cfbf9 authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds

mm: goodbye remove_from_page_cache()

Now delete_from_page_cache() replaces remove_from_page_cache().  So we
remove remove_from_page_cache so fs or something out of mainline will
notice it when compile time and can fix it.
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 5adc7b51
...@@ -456,7 +456,6 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping, ...@@ -456,7 +456,6 @@ 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, int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
pgoff_t index, gfp_t gfp_mask); pgoff_t index, gfp_t gfp_mask);
extern void delete_from_page_cache(struct page *page); extern void delete_from_page_cache(struct page *page);
extern void remove_from_page_cache(struct page *page);
extern void __remove_from_page_cache(struct page *page); extern void __remove_from_page_cache(struct page *page);
int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask); int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask);
......
...@@ -137,7 +137,15 @@ void __remove_from_page_cache(struct page *page) ...@@ -137,7 +137,15 @@ void __remove_from_page_cache(struct page *page)
} }
} }
void remove_from_page_cache(struct page *page) /**
* delete_from_page_cache - delete page from page cache
* @page: the page which the kernel is trying to remove from page cache
*
* This must be called only on pages that have been verified to be in the page
* cache and locked. It will never put the page into the free list, the caller
* has a reference on the page.
*/
void delete_from_page_cache(struct page *page)
{ {
struct address_space *mapping = page->mapping; struct address_space *mapping = page->mapping;
void (*freepage)(struct page *); void (*freepage)(struct page *);
...@@ -152,21 +160,6 @@ void remove_from_page_cache(struct page *page) ...@@ -152,21 +160,6 @@ void remove_from_page_cache(struct page *page)
if (freepage) if (freepage)
freepage(page); freepage(page);
}
EXPORT_SYMBOL(remove_from_page_cache);
/**
* delete_from_page_cache - delete page from page cache
* @page: the page which the kernel is trying to remove from page cache
*
* This must be called only on pages that have
* been verified to be in the page cache and locked.
* It will never put the page into the free list,
* the caller has a reference on the page.
*/
void delete_from_page_cache(struct page *page)
{
remove_from_page_cache(page);
page_cache_release(page); page_cache_release(page);
} }
EXPORT_SYMBOL(delete_from_page_cache); EXPORT_SYMBOL(delete_from_page_cache);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment