Commit 5d7ae891 authored by Wei Yang's avatar Wei Yang Committed by Linus Torvalds

mm/migrate.c: check pagelist in move_pages_and_store_status()

When pagelist is empty, it is not necessary to do the move and store.
Also it consolidate the empty list check in one place.
Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Link: http://lkml.kernel.org/r/20200214003017.25558-4-richardw.yang@linux.intel.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7ca8783a
...@@ -1518,9 +1518,6 @@ static int do_move_pages_to_node(struct mm_struct *mm, ...@@ -1518,9 +1518,6 @@ static int do_move_pages_to_node(struct mm_struct *mm,
{ {
int err; int err;
if (list_empty(pagelist))
return 0;
err = migrate_pages(pagelist, alloc_new_node_page, NULL, node, err = migrate_pages(pagelist, alloc_new_node_page, NULL, node,
MIGRATE_SYNC, MR_SYSCALL); MIGRATE_SYNC, MR_SYSCALL);
if (err) if (err)
...@@ -1608,6 +1605,9 @@ static int move_pages_and_store_status(struct mm_struct *mm, int node, ...@@ -1608,6 +1605,9 @@ static int move_pages_and_store_status(struct mm_struct *mm, int node,
{ {
int err; int err;
if (list_empty(pagelist))
return 0;
err = do_move_pages_to_node(mm, pagelist, node); err = do_move_pages_to_node(mm, pagelist, node);
if (err) { if (err) {
/* /*
...@@ -1705,9 +1705,6 @@ static int do_pages_move(struct mm_struct *mm, nodemask_t task_nodes, ...@@ -1705,9 +1705,6 @@ static int do_pages_move(struct mm_struct *mm, nodemask_t task_nodes,
current_node = NUMA_NO_NODE; current_node = NUMA_NO_NODE;
} }
out_flush: out_flush:
if (list_empty(&pagelist))
return err;
/* Make sure we do not overwrite the existing error */ /* Make sure we do not overwrite the existing error */
err1 = move_pages_and_store_status(mm, current_node, &pagelist, err1 = move_pages_and_store_status(mm, current_node, &pagelist,
status, start, i, nr_pages); status, start, i, nr_pages);
......
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