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.6 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 B1F7CC388F7 for ; Sat, 31 Oct 2020 09:19:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3D23620756 for ; Sat, 31 Oct 2020 09:19:51 +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="qcZqxVQC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D23620756 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B02246B0062; Sat, 31 Oct 2020 05:19:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB1EE6B006E; Sat, 31 Oct 2020 05:19:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A10E6B0070; Sat, 31 Oct 2020 05:19:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0196.hostedemail.com [216.40.44.196]) by kanga.kvack.org (Postfix) with ESMTP id 6D2BC6B0062 for ; Sat, 31 Oct 2020 05:19:50 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id F213C181AEF15 for ; Sat, 31 Oct 2020 09:19:49 +0000 (UTC) X-FDA: 77431673298.10.frame67_5f0f0822729d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id C9F7616A07E for ; Sat, 31 Oct 2020 09:19:49 +0000 (UTC) X-HE-Tag: frame67_5f0f0822729d X-Filterd-Recvd-Size: 4589 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Sat, 31 Oct 2020 09:19: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=rACcJrs34gaXXkKYt1uTpo4yAED7NWPkcMr50Jhtq5o=; b=qcZqxVQCmDjR2LuBgBCPF3Axfb 5tHG4/g/tJd5jsQSUq6+Wx5UVge9UzCuC5bExxEsu7CDV4ylV+s9GBDOSrdKakIyr9hZIXWoJdSFd ZYEtDhWtapmWbt8/etCpmxDjStlJJnFMg4wyKk6g3KBQCMU7NxyQIjxfCbbjSrmUFyR6yVQlpUDmu rbxwJhGUO8wLvBo3ql/9evqeqwOS8VKkiymWEMXW32dZW4HIjENi9uhdfrKPzQCqs22HUQfyWHDXg RBow75EKZhCvw7lv+1vl8a1kpI4fLD8/9HkgADy1S878n/SjhR3YtY8XuWvBCSXuiDKjElvFIp74R j1eLwlpQ==; Received: from 089144193201.atnat0002.highway.a1.net ([89.144.193.201] helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYn33-00086W-6x; Sat, 31 Oct 2020 09:19:45 +0000 From: Christoph Hellwig To: Andrew Morton Cc: Kent Overstreet , Matthew Wilcox , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 08/13] mm: move putting the page on error out of filemap_readpage Date: Sat, 31 Oct 2020 09:59:59 +0100 Message-Id: <20201031090004.452516-9-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201031090004.452516-1-hch@lst.de> References: <20201031090004.452516-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html 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: Move the put_page on error from filemap_readpage into the callers. Signed-off-by: Christoph Hellwig --- mm/filemap.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 96855299247c56..6089f1d9dd429f 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2171,11 +2171,11 @@ static int lock_page_for_iocb(struct kiocb *iocb,= struct page *page) static int filemap_readpage(struct kiocb *iocb, struct page *page) { struct file *file =3D iocb->ki_filp; - int error =3D -EAGAIN; + int error; =20 if (iocb->ki_flags & (IOCB_NOIO | IOCB_NOWAIT)) { unlock_page(page); - goto out_put_page; + return -EAGAIN; } =20 /* @@ -2186,12 +2186,12 @@ static int filemap_readpage(struct kiocb *iocb, s= truct page *page) /* Start the actual read. The read will unlock the page. */ error =3D file->f_mapping->a_ops->readpage(file, page); if (unlikely(error)) - goto out_put_page; + return error; =20 if (!PageUptodate(page)) { error =3D lock_page_for_iocb(iocb, page); if (unlikely(error)) - goto out_put_page; + return error; =20 if (!PageUptodate(page)) { if (page->mapping =3D=3D NULL) { @@ -2199,22 +2199,16 @@ static int filemap_readpage(struct kiocb *iocb, s= truct page *page) * invalidate_mapping_pages got it */ unlock_page(page); - error =3D AOP_TRUNCATED_PAGE; - goto out_put_page; + return AOP_TRUNCATED_PAGE; } unlock_page(page); shrink_readahead_size_eio(&file->f_ra); - error =3D -EIO; - goto out_put_page; + return -EIO; } =20 unlock_page(page); } return 0; - -out_put_page: - put_page(page); - return error; } =20 static int filemap_make_page_uptodate(struct kiocb *iocb, struct iov_ite= r *iter, @@ -2293,7 +2287,10 @@ static int filemap_make_page_uptodate(struct kiocb= *iocb, struct iov_iter *iter, /* Did somebody else fill it already? */ if (PageUptodate(page)) goto unlock_page; - return filemap_readpage(iocb, page); + error =3D filemap_readpage(iocb, page); + if (error) + goto put_page; + return 0; =20 put_page: put_page(page); @@ -2315,15 +2312,15 @@ static int filemap_new_page(struct kiocb *iocb, s= truct iov_iter *iter, if (!page) return -ENOMEM; error =3D add_to_page_cache_lru(*page, mapping, index, gfp); - if (error) { - put_page(*page); - return error; - } - + if (error) + goto put_page; error =3D filemap_readpage(iocb, *page); if (error) - return error; + goto put_page; return filemap_make_page_uptodate(iocb, iter, *page, index, true); +put_page: + put_page(*page); + return error; } =20 static int filemap_find_get_pages(struct kiocb *iocb, struct iov_iter *i= ter, --=20 2.28.0