The patch titled rmap: simplify try_to_unmap_file() has been added to the -mm tree. Its filename is rmap-simplify-try_to_unmap_file.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/ ------------------------------------------------------ Subject: rmap: simplify try_to_unmap_file() From: Huang Shijie <shijie8@xxxxxxxxx> Just simplify the code when `mlocked' is true. Signed-off-by: Huang Shijie <shijie8@xxxxxxxxx> Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- diff -puN mm/rmap.c~rmap-simplify-try_to_unmap_file mm/rmap.c --- a/mm/rmap.c~rmap-simplify-try_to_unmap_file +++ a/mm/rmap.c @@ -1103,13 +1103,10 @@ static int try_to_unmap_file(struct page if (ret == SWAP_MLOCK) { mlocked = try_to_mlock_page(page, vma); if (mlocked) - break; /* stop if actually mlocked page */ + goto out; /* stop if actually mlocked page */ } } - if (mlocked) - goto out; - if (list_empty(&mapping->i_mmap_nonlinear)) goto out; _ Patches currently in -mm which might be from shijie8@xxxxxxxxx are rmap-fix-the-comment-for-try_to_unmap_anon.patch rmap-simplify-try_to_unmap_file.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