diff options
author | Wei Yang | 2020-01-31 00:11:14 -0600 |
---|---|---|
committer | Greg Kroah-Hartman | 2020-02-05 08:43:54 -0600 |
commit | b6606cc13491b4065a7a762890b9c21098812acd (patch) | |
tree | aabe22269d7b2eabdcec61034b2db18ca656524f | |
parent | 0649c61de46220645721d951855407116f2ddfdd (diff) | |
download | kernel-b6606cc13491b4065a7a762890b9c21098812acd.tar.gz kernel-b6606cc13491b4065a7a762890b9c21098812acd.tar.xz kernel-b6606cc13491b4065a7a762890b9c21098812acd.zip |
mm/migrate.c: also overwrite error when it is bigger than zero
[ Upstream commit dfe9aa23cab7880a794db9eb2d176c00ed064eb6 ]
If we get here after successfully adding page to list, err would be 1 to
indicate the page is queued in the list.
Current code has two problems:
* on success, 0 is not returned
* on error, if add_page_for_migratioin() return 1, and the following err1
from do_move_pages_to_node() is set, the err1 is not returned since err
is 1
And these behaviors break the user interface.
Link: http://lkml.kernel.org/r/20200119065753.21694-1-richardw.yang@linux.intel.com
Fixes: e0153fc2c760 ("mm: move_pages: return valid node id in status if the page is already on the target node").
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Acked-by: Yang Shi <yang.shi@linux.alibaba.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Christoph Lameter <cl@linux.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | mm/migrate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 593557c107d2..70f8ad4ade3f 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
@@ -1672,7 +1672,7 @@ out_flush: | |||
1672 | err1 = do_move_pages_to_node(mm, &pagelist, current_node); | 1672 | err1 = do_move_pages_to_node(mm, &pagelist, current_node); |
1673 | if (!err1) | 1673 | if (!err1) |
1674 | err1 = store_status(status, start, current_node, i - start); | 1674 | err1 = store_status(status, start, current_node, i - start); |
1675 | if (!err) | 1675 | if (err >= 0) |
1676 | err = err1; | 1676 | err = err1; |
1677 | out: | 1677 | out: |
1678 | return err; | 1678 | return err; |