@@ -2543,7 +2543,7 @@ static unsigned int reclaim_page_list(struct list_head *page_list,
unsigned long reclaim_pages(struct list_head *page_list)
{
- int nid = NUMA_NO_NODE;
+ int nid;
unsigned int nr_reclaimed = 0;
LIST_HEAD(node_page_list);
struct page *page;
@@ -2554,10 +2554,9 @@ unsigned long reclaim_pages(struct list_head *page_list)
noreclaim_flag = memalloc_noreclaim_save();
+ nid = page_to_nid(lru_to_page(page_list));
do {
page = lru_to_page(page_list);
- if (nid == NUMA_NO_NODE)
- nid = page_to_nid(page);
if (nid == page_to_nid(page)) {
ClearPageActive(page);
@@ -2566,7 +2565,7 @@ unsigned long reclaim_pages(struct list_head *page_list)
}
nr_reclaimed += reclaim_page_list(&node_page_list, NODE_DATA(nid));
- nid = NUMA_NO_NODE;
+ nid = page_to_nid(lru_to_page(page_list));
} while (!list_empty(page_list));
nr_reclaimed += reclaim_page_list(&node_page_list, NODE_DATA(nid));
Now we are sure there is at lease one page on page_list, so it is safe to get the nid of it. This means it is not necessary to use NUMA_NO_NODE as an indicator for the beginning of iteration or a page on different node. Signed-off-by: Wei Yang <richard.weiyang@gmail.com> --- mm/vmscan.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)