The patch titled Subject: mm/migrate.c: pair unlock_page() and lock_page() when migrating huge pages has been added to the -mm tree. Its filename is mm-migratec-pair-unlock_page-and-lock_page-when-migrating-huge-pages.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Hillf Danton <dhillf@xxxxxxxxx> Subject: mm/migrate.c: pair unlock_page() and lock_page() when migrating huge pages Avoid unlocking and unlocked page if we failed to lock it. Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx> Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/migrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/migrate.c~mm-migratec-pair-unlock_page-and-lock_page-when-migrating-huge-pages mm/migrate.c --- a/mm/migrate.c~mm-migratec-pair-unlock_page-and-lock_page-when-migrating-huge-pages +++ a/mm/migrate.c @@ -871,9 +871,9 @@ static int unmap_and_move_huge_page(new_ if (anon_vma) put_anon_vma(anon_vma); -out: unlock_page(hpage); +out: if (rc != -EAGAIN) { list_del(&hpage->lru); put_page(hpage); _ Subject: Subject: mm/migrate.c: pair unlock_page() and lock_page() when migrating huge pages Patches currently in -mm which might be from dhillf@xxxxxxxxx are linux-next.patch mm-migratec-pair-unlock_page-and-lock_page-when-migrating-huge-pages.patch hugetlb-detect-race-upon-page-allocation-failure-during-cow.patch hugetlb-clarify-hugetlb_instantiation_mutex-usage.patch mm-compaction-push-isolate-search-base-of-compact-control-one-pfn-ahead.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html