summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorWei Yang <richardw.yang@linux.intel.com>2020-04-07 05:04:15 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2020-04-07 19:43:38 +0200
commit5d7ae891cdc68f30e8b6db35bbd7f0b1aeee189c (patch)
tree7fb633fbccabb5e5935e0021638a90e2e364b946 /mm
parentmm/migrate.c: wrap do_move_pages_to_node() and store_status() (diff)
downloadlinux-5d7ae891cdc68f30e8b6db35bbd7f0b1aeee189c.tar.xz
linux-5d7ae891cdc68f30e8b6db35bbd7f0b1aeee189c.zip
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: Wei Yang <richardw.yang@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: David Hildenbrand <david@redhat.com> Acked-by: Michal Hocko <mhocko@suse.com> Link: http://lkml.kernel.org/r/20200214003017.25558-4-richardw.yang@linux.intel.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/migrate.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/mm/migrate.c b/mm/migrate.c
index 6f6317903007..80eaa99bed39 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1518,9 +1518,6 @@ static int do_move_pages_to_node(struct mm_struct *mm,
{
int err;
- if (list_empty(pagelist))
- return 0;
-
err = migrate_pages(pagelist, alloc_new_node_page, NULL, node,
MIGRATE_SYNC, MR_SYSCALL);
if (err)
@@ -1608,6 +1605,9 @@ static int move_pages_and_store_status(struct mm_struct *mm, int node,
{
int err;
+ if (list_empty(pagelist))
+ return 0;
+
err = do_move_pages_to_node(mm, pagelist, node);
if (err) {
/*
@@ -1705,9 +1705,6 @@ static int do_pages_move(struct mm_struct *mm, nodemask_t task_nodes,
current_node = NUMA_NO_NODE;
}
out_flush:
- if (list_empty(&pagelist))
- return err;
-
/* Make sure we do not overwrite the existing error */
err1 = move_pages_and_store_status(mm, current_node, &pagelist,
status, start, i, nr_pages);