Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2415725yba; Thu, 25 Apr 2019 16:24:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDbsc/qznAp6jYcQUy9cvNsTcc0oE+aF68EtCihU6iNavYs8eZGcw1BSGxfIRTwRqiOgNf X-Received: by 2002:a63:1b11:: with SMTP id b17mr993366pgb.207.1556234680284; Thu, 25 Apr 2019 16:24:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556234680; cv=none; d=google.com; s=arc-20160816; b=rUPfdsLdB3nSwRJ0hvkq7/sJIMw2gpXpf9pItkWL6E4urT7c1XJGpz1f9PvVNQNpsI ReBNKLo6P7STzAW0TpHzLkY+TKsizS5Cv3EmEkOmMgIDS5ZOPzy01w7Dpm/knoloDRHH SEhjFv5kWRyQYJz9qnI2O4zgV9ZBdzkHS/G6It6sb2uyxjnjK+VSVFYF2Rq/gYCkmN4n 7Xd2cnG/kGRecqv/rYZnqvKeAHnA2YWprJw2thaYWDGRmC3bCtqq6Mxm5YEX5B+MfBAE bMOvzHooqJ9BssI7vIzEybrMe/x8iS0r1xHHMyJNsXDVzngR63Ga4QWsBO7TdkuUSoIC O2PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=Jm7Td0ydvy/zx34Vn9ezBbNevy98T2J+z9uUohGQ2Q4=; b=ZlAfho8IIuuzCf5z/7Mg3pInd2iNzOoDdmIb1jki+RndWWZIPcv75vGjO7i5RTg02U b0oQ67+83buU+1z1VyOSXDTGzO0teoh36fpa9oH0RUYbTVkrsiX9KVfmyriWl6qJGK3q fI1mxFBma4ZmbunkiMTdXJ7EhcO4J25coEoIJsHdPjOTAYsP9ywVezlQUfE+HSo1/fLS l5Ka7kZamSFf2WTj6vevzzjJD/C5W1asWHvU8T2NpRbcB60e4YrMo4KPMy+rxsrth0Yr Z4GbzMVvwJzNHJnisFtfc3H6D/oFYN/+bB4NGhm3TaA9+rzQZFVADN3WgSHZxm2Kf7D6 8N1g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t2si23488449plq.56.2019.04.25.16.24.21; Thu, 25 Apr 2019 16:24:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729191AbfDYXWW (ORCPT + 99 others); Thu, 25 Apr 2019 19:22:22 -0400 Received: from out30-132.freemail.mail.aliyun.com ([115.124.30.132]:52735 "EHLO out30-132.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726419AbfDYXWU (ORCPT ); Thu, 25 Apr 2019 19:22:20 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=yang.shi@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0TQFDOB0_1556234531; Received: from e19h19392.et15sqa.tbsite.net(mailfrom:yang.shi@linux.alibaba.com fp:SMTPD_---0TQFDOB0_1556234531) by smtp.aliyun-inc.com(127.0.0.1); Fri, 26 Apr 2019 07:22:18 +0800 From: Yang Shi To: josef@toxicpanda.com, akpm@linux-foundation.org Cc: yang.shi@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: filemap: correct the comment about VM_FAULT_RETRY Date: Fri, 26 Apr 2019 07:22:11 +0800 Message-Id: <1556234531-108228-1-git-send-email-yang.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The commit 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. Cc: Josef Bacik Signed-off-by: Yang Shi --- mm/filemap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index d78f577..f0d6250 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2545,10 +2545,8 @@ static struct file *do_async_mmap_readahead(struct vm_fault *vmf, * * 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. -- 1.8.3.1