The patch titled Subject: mm/filemap.c: correct the comment about VM_FAULT_RETRY has been added to the -mm tree. Its filename is mm-filemap-correct-the-comment-about-vm_fault_retry.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-filemap-correct-the-comment-about-vm_fault_retry.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-filemap-correct-the-comment-about-vm_fault_retry.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/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx> Subject: mm/filemap.c: correct the comment about VM_FAULT_RETRY 6b4c9f446981 ("filemap: drop the mmap_sem for all blocking operations") changed when mmap_sem is dropped during filemap page fault and when returning VM_FAULT_RETRY. Correct the comment to reflect the change. Link: http://lkml.kernel.org/r/1556234531-108228-1-git-send-email-yang.shi@xxxxxxxxxxxxxxxxx Signed-off-by: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx> Reviewed-by: Josef Bacik <josef@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/filemap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/mm/filemap.c~mm-filemap-correct-the-comment-about-vm_fault_retry +++ a/mm/filemap.c @@ -2456,10 +2456,8 @@ static struct file *do_async_mmap_readah * * vma->vm_mm->mmap_sem must be held on entry. * - * If our return value has VM_FAULT_RETRY set, it's because - * lock_page_or_retry() returned 0. - * The mmap_sem has usually been released in this case. - * See __lock_page_or_retry() for the exception. + * If our return value has VM_FAULT_RETRY set, it's because the mmap_sem + * may be dropped before doing I/O or by lock_page_maybe_drop_mmap(). * * If our return value does not have VM_FAULT_RETRY set, the mmap_sem * has not been released. _ Patches currently in -mm which might be from yang.shi@xxxxxxxxxxxxxxxxx are mm-mmu_gather-remove-__tlb_reset_range-for-force-flush.patch mm-filemap-correct-the-comment-about-vm_fault_retry.patch