From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B75EBC43457 for ; Fri, 16 Oct 2020 16:05:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 37ECB20897 for ; Fri, 16 Oct 2020 16:05:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="L+qGRwq9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37ECB20897 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E9591940007; Fri, 16 Oct 2020 12:04:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DD25594000D; Fri, 16 Oct 2020 12:04:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C9C4E940007; Fri, 16 Oct 2020 12:04:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0100.hostedemail.com [216.40.44.100]) by kanga.kvack.org (Postfix) with ESMTP id 1BBBD94000D for ; Fri, 16 Oct 2020 12:04:52 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id DB2F83631 for ; Fri, 16 Oct 2020 16:04:51 +0000 (UTC) X-FDA: 77378261982.02.plane82_2f0266e2721e Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id BE059100CCA45 for ; Fri, 16 Oct 2020 16:04:51 +0000 (UTC) X-HE-Tag: plane82_2f0266e2721e X-Filterd-Recvd-Size: 3121 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Fri, 16 Oct 2020 16:04:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=eXIZ/2X0EY8JcIBfJAYRGkfxW4dL9sFOoP0NZnrF17k=; b=L+qGRwq93bTXE6spF7zzaJWnYg yU56B8yP3RpbfnQfb9WduyrO2aXz8wf3JXpJoYCLg2GelXRJ53wYcA/LeDMkI5VrtdOOsSW1i4e76 Fzp4no1EbmYxz0TMYJ0Ti3gS0VtN/rYBedprHGLCzxdgMBiI1BE1Gaux0bG+sUBIjGg1qtxSDEFjs T3TKXNtzDhmWzMcuhaMUrOzVc066oLFCErTThPD7XRVEbgMPYro1ONQ2qGxpK80hT3KojTq8VSkHS fNAaN2DwsNIoCA4MwdnNA5ln3RQOlp5PDIXk+QiiGRYbYzhUdePN8sUQbosFRpDD/2M2hs53AbEHD qbw4sXTA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kTSDl-0004sO-Rw; Fri, 16 Oct 2020 16:04:45 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Christoph Hellwig Subject: [PATCH v3 04/18] mm/filemap: Inline wait_on_page_read into its one caller Date: Fri, 16 Oct 2020 17:04:29 +0100 Message-Id: <20201016160443.18685-5-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201016160443.18685-1-willy@infradead.org> References: <20201016160443.18685-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Having this code inline helps the function read more easily. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig --- mm/filemap.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 95b68ec1f22c..0ef06d515532 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2834,18 +2834,6 @@ EXPORT_SYMBOL(filemap_page_mkwrite); EXPORT_SYMBOL(generic_file_mmap); EXPORT_SYMBOL(generic_file_readonly_mmap); =20 -static struct page *wait_on_page_read(struct page *page) -{ - if (!IS_ERR(page)) { - wait_on_page_locked(page); - if (!PageUptodate(page)) { - put_page(page); - page =3D ERR_PTR(-EIO); - } - } - return page; -} - static struct page *do_read_cache_page(struct address_space *mapping, pgoff_t index, int (*filler)(void *, struct page *), @@ -2876,7 +2864,10 @@ static struct page *do_read_cache_page(struct addr= ess_space *mapping, err =3D mapping->a_ops->readpage(data, page); if (err =3D=3D AOP_UPDATED_PAGE) { unlock_page(page); - goto out; + } else if (!err) { + wait_on_page_locked(page); + if (!PageUptodate(page)) + err =3D -EIO; } =20 if (err < 0) { @@ -2884,9 +2875,6 @@ static struct page *do_read_cache_page(struct addre= ss_space *mapping, return ERR_PTR(err); } =20 - page =3D wait_on_page_read(page); - if (IS_ERR(page)) - return page; goto out; } if (PageUptodate(page)) --=20 2.28.0