mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 04:33:26 +02:00
mm: fold and remove lru_cache_add_anon() and lru_cache_add_file()
They're the same function, and for the purpose of all callers they are equivalent to lru_cache_add(). [akpm@linux-foundation.org: fix it for local_lock changes] Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Rik van Riel <riel@surriel.com> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Minchan Kim <minchan@kernel.org> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Link: http://lkml.kernel.org/r/20200520232525.798933-5-hannes@cmpxchg.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
c843966c55
commit
6058eaec81
42
mm/swap.c
42
mm/swap.c
@@ -424,37 +424,6 @@ void mark_page_accessed(struct page *page)
|
||||
}
|
||||
EXPORT_SYMBOL(mark_page_accessed);
|
||||
|
||||
static void __lru_cache_add(struct page *page)
|
||||
{
|
||||
struct pagevec *pvec;
|
||||
|
||||
local_lock(&lru_pvecs.lock);
|
||||
pvec = this_cpu_ptr(&lru_pvecs.lru_add);
|
||||
get_page(page);
|
||||
if (!pagevec_add(pvec, page) || PageCompound(page))
|
||||
__pagevec_lru_add(pvec);
|
||||
local_unlock(&lru_pvecs.lock);
|
||||
}
|
||||
|
||||
/**
|
||||
* lru_cache_add_anon - add a page to the page lists
|
||||
* @page: the page to add
|
||||
*/
|
||||
void lru_cache_add_anon(struct page *page)
|
||||
{
|
||||
if (PageActive(page))
|
||||
ClearPageActive(page);
|
||||
__lru_cache_add(page);
|
||||
}
|
||||
|
||||
void lru_cache_add_file(struct page *page)
|
||||
{
|
||||
if (PageActive(page))
|
||||
ClearPageActive(page);
|
||||
__lru_cache_add(page);
|
||||
}
|
||||
EXPORT_SYMBOL(lru_cache_add_file);
|
||||
|
||||
/**
|
||||
* lru_cache_add - add a page to a page list
|
||||
* @page: the page to be added to the LRU.
|
||||
@@ -466,10 +435,19 @@ EXPORT_SYMBOL(lru_cache_add_file);
|
||||
*/
|
||||
void lru_cache_add(struct page *page)
|
||||
{
|
||||
struct pagevec *pvec;
|
||||
|
||||
VM_BUG_ON_PAGE(PageActive(page) && PageUnevictable(page), page);
|
||||
VM_BUG_ON_PAGE(PageLRU(page), page);
|
||||
__lru_cache_add(page);
|
||||
|
||||
get_page(page);
|
||||
local_lock(&lru_pvecs.lock);
|
||||
pvec = this_cpu_ptr(&lru_pvecs.lru_add);
|
||||
if (!pagevec_add(pvec, page) || PageCompound(page))
|
||||
__pagevec_lru_add(pvec);
|
||||
local_unlock(&lru_pvecs.lock);
|
||||
}
|
||||
EXPORT_SYMBOL(lru_cache_add);
|
||||
|
||||
/**
|
||||
* lru_cache_add_active_or_unevictable
|
||||
|
Reference in New Issue
Block a user