diff options
| author | Mel Gorman <mgorman@suse.de> | 2013-12-18 17:08:39 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 12:24:23 -0800 |
| commit | a29ccdd1b5a61fad7d4883b3ef63da3a313f1e44 (patch) | |
| tree | 35589e2f1f251451b6b3b11765bf3738d42defd6 /mm | |
| parent | 4455c567b8a231d6aa8bf077facfa559d2605357 (diff) | |
| download | linux-3.10-a29ccdd1b5a61fad7d4883b3ef63da3a313f1e44.tar.gz linux-3.10-a29ccdd1b5a61fad7d4883b3ef63da3a313f1e44.tar.bz2 linux-3.10-a29ccdd1b5a61fad7d4883b3ef63da3a313f1e44.zip | |
mm: numa: avoid unnecessary work on the failure path
commit eb4489f69f224356193364dc2762aa009738ca7f upstream.
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: Mel Gorman <mgorman@suse.de>
Reviewed-by: Rik van Riel <riel@redhat.com>
Cc: Alex Thorlton <athorlton@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/migrate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index bf436c15f05..a88c12f2235 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1715,7 +1715,8 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm, putback_lru_page(page); mod_zone_page_state(page_zone(page), NR_ISOLATED_ANON + page_lru, -HPAGE_PMD_NR); - goto out_fail; + + goto out_unlock; } /* @@ -1765,6 +1766,7 @@ out_dropref: set_pmd_at(mm, haddr, pmd, entry); update_mmu_cache_pmd(vma, address, &entry); +out_unlock: unlock_page(page); put_page(page); return 0; |