Commit eb4489f6 authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds

mm: numa: avoid unnecessary work on the failure path

If a PMD changes during a THP migration then migration aborts but the
failure path is doing more work than is necessary.
Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Cc: Alex Thorlton <athorlton@sgi.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c3a489ca
...@@ -1780,7 +1780,8 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm, ...@@ -1780,7 +1780,8 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
putback_lru_page(page); putback_lru_page(page);
mod_zone_page_state(page_zone(page), mod_zone_page_state(page_zone(page),
NR_ISOLATED_ANON + page_lru, -HPAGE_PMD_NR); NR_ISOLATED_ANON + page_lru, -HPAGE_PMD_NR);
goto out_fail;
goto out_unlock;
} }
/* /*
...@@ -1854,6 +1855,7 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm, ...@@ -1854,6 +1855,7 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
} }
spin_unlock(ptl); spin_unlock(ptl);
out_unlock:
unlock_page(page); unlock_page(page);
put_page(page); put_page(page);
return 0; return 0;
......
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