mm: replace init_page_accessed by __SetPageReferenced
Do we really need an exported alias for __SetPageReferenced()? Its callers better know what they're doing, in which case the page would not be already marked referenced. Kill init_page_accessed(), just __SetPageReferenced() inline. Signed-off-by: Hugh Dickins <hughd@google.com> Acked-by: Mel Gorman <mgorman@suse.de> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Michal Hocko <mhocko@suse.cz> Cc: Dave Hansen <dave.hansen@intel.com> Cc: Prabhakar Lad <prabhakar.csengg@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
c2ea2181db
Коммит
eb39d618f9
|
@ -311,7 +311,6 @@ extern void lru_add_page_tail(struct page *page, struct page *page_tail,
|
|||
struct lruvec *lruvec, struct list_head *head);
|
||||
extern void activate_page(struct page *);
|
||||
extern void mark_page_accessed(struct page *);
|
||||
extern void init_page_accessed(struct page *page);
|
||||
extern void lru_add_drain(void);
|
||||
extern void lru_add_drain_cpu(int cpu);
|
||||
extern void lru_add_drain_all(void);
|
||||
|
|
|
@ -1091,9 +1091,9 @@ no_page:
|
|||
if (WARN_ON_ONCE(!(fgp_flags & FGP_LOCK)))
|
||||
fgp_flags |= FGP_LOCK;
|
||||
|
||||
/* Init accessed so avoit atomic mark_page_accessed later */
|
||||
/* Init accessed so avoid atomic mark_page_accessed later */
|
||||
if (fgp_flags & FGP_ACCESSED)
|
||||
init_page_accessed(page);
|
||||
__SetPageReferenced(page);
|
||||
|
||||
err = add_to_page_cache_lru(page, mapping, offset, radix_gfp_mask);
|
||||
if (unlikely(err)) {
|
||||
|
|
|
@ -1166,7 +1166,7 @@ repeat:
|
|||
__SetPageSwapBacked(page);
|
||||
__set_page_locked(page);
|
||||
if (sgp == SGP_WRITE)
|
||||
init_page_accessed(page);
|
||||
__SetPageReferenced(page);
|
||||
|
||||
error = mem_cgroup_charge_file(page, current->mm,
|
||||
gfp & GFP_RECLAIM_MASK);
|
||||
|
|
14
mm/swap.c
14
mm/swap.c
|
@ -589,6 +589,9 @@ static void __lru_cache_activate_page(struct page *page)
|
|||
* inactive,unreferenced -> inactive,referenced
|
||||
* inactive,referenced -> active,unreferenced
|
||||
* active,unreferenced -> active,referenced
|
||||
*
|
||||
* When a newly allocated page is not yet visible, so safe for non-atomic ops,
|
||||
* __SetPageReferenced(page) may be substituted for mark_page_accessed(page).
|
||||
*/
|
||||
void mark_page_accessed(struct page *page)
|
||||
{
|
||||
|
@ -614,17 +617,6 @@ void mark_page_accessed(struct page *page)
|
|||
}
|
||||
EXPORT_SYMBOL(mark_page_accessed);
|
||||
|
||||
/*
|
||||
* Used to mark_page_accessed(page) that is not visible yet and when it is
|
||||
* still safe to use non-atomic ops
|
||||
*/
|
||||
void init_page_accessed(struct page *page)
|
||||
{
|
||||
if (!PageReferenced(page))
|
||||
__SetPageReferenced(page);
|
||||
}
|
||||
EXPORT_SYMBOL(init_page_accessed);
|
||||
|
||||
static void __lru_cache_add(struct page *page)
|
||||
{
|
||||
struct pagevec *pvec = &get_cpu_var(lru_add_pvec);
|
||||
|
|
Загрузка…
Ссылка в новой задаче