Commit a1100a74 authored by Fengguang Wu's avatar Fengguang Wu Committed by Linus Torvalds

mm/swap.c: trivial mark_page_accessed() cleanup

This avoids duplicated PageReferenced() calls.  No behavior change.

Link: http://lkml.kernel.org/r/20191016225326.GB12497@wfg-t540p.sh.intel.comSigned-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Liu Jingqi <jingqi.liu@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 12d2966d
...@@ -373,9 +373,16 @@ static void __lru_cache_activate_page(struct page *page) ...@@ -373,9 +373,16 @@ static void __lru_cache_activate_page(struct page *page)
void mark_page_accessed(struct page *page) void mark_page_accessed(struct page *page)
{ {
page = compound_head(page); page = compound_head(page);
if (!PageActive(page) && !PageUnevictable(page) &&
PageReferenced(page)) {
if (!PageReferenced(page)) {
SetPageReferenced(page);
} else if (PageUnevictable(page)) {
/*
* Unevictable pages are on the "LRU_UNEVICTABLE" list. But,
* this list is never rotated or maintained, so marking an
* evictable page accessed has no effect.
*/
} else if (!PageActive(page)) {
/* /*
* If the page is on the LRU, queue it for activation via * If the page is on the LRU, queue it for activation via
* activate_page_pvecs. Otherwise, assume the page is on a * activate_page_pvecs. Otherwise, assume the page is on a
...@@ -389,8 +396,6 @@ void mark_page_accessed(struct page *page) ...@@ -389,8 +396,6 @@ void mark_page_accessed(struct page *page)
ClearPageReferenced(page); ClearPageReferenced(page);
if (page_is_file_cache(page)) if (page_is_file_cache(page))
workingset_activation(page); workingset_activation(page);
} else if (!PageReferenced(page)) {
SetPageReferenced(page);
} }
if (page_is_idle(page)) if (page_is_idle(page))
clear_page_idle(page); clear_page_idle(page);
......
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