From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 714456B025E for ; Wed, 15 Jun 2016 16:06:57 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id 143so64001545pfx.0 for ; Wed, 15 Jun 2016 13:06:57 -0700 (PDT) Received: from mga11.intel.com (mga11.intel.com. [192.55.52.93]) by mx.google.com with ESMTP id iu4si5510808pac.93.2016.06.15.13.06.54 for ; Wed, 15 Jun 2016 13:06:54 -0700 (PDT) From: "Kirill A. Shutemov" Subject: [PATCHv9-rebased2 04/37] mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix-2-fix Date: Wed, 15 Jun 2016 23:06:09 +0300 Message-Id: <1466021202-61880-5-git-send-email-kirill.shutemov@linux.intel.com> In-Reply-To: <1466021202-61880-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1465222029-45942-1-git-send-email-kirill.shutemov@linux.intel.com> <1466021202-61880-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: owner-linux-mm@kvack.org List-ID: To: Hugh Dickins , Andrea Arcangeli , Andrew Morton Cc: Dave Hansen , Vlastimil Babka , Christoph Lameter , Naoya Horiguchi , Jerome Marchand , Yang Shi , Sasha Levin , Andres Lagar-Cavilla , Ning Qu , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Ebru Akagunduz , "Kirill A . Shutemov" , Rik van Riel , Sergey Senozhatsky , Stephen Rothwell From: Andrew Morton update comment to match new code Cc: Andrea Arcangeli Cc: Ebru Akagunduz Cc: Kirill A. Shutemov Cc: Rik van Riel Cc: Sergey Senozhatsky Cc: Stephen Rothwell Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- mm/huge_memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 1777b806de96..d7ccc8558187 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2502,9 +2502,9 @@ static void collapse_huge_page(struct mm_struct *mm, } /* - * __collapse_huge_page_swapin always returns with mmap_sem - * locked. If it fails, release mmap_sem and jump directly - * label out. Continuing to collapse causes inconsistency. + * __collapse_huge_page_swapin always returns with mmap_sem locked. + * If it fails, release mmap_sem and jump directly out. + * Continuing to collapse causes inconsistency. */ if (!__collapse_huge_page_swapin(mm, vma, address, pmd)) { mem_cgroup_cancel_charge(new_page, memcg, true); -- 2.8.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org