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 2507CC4742C for ; Sat, 31 Oct 2020 09:04:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 89ED220756 for ; Sat, 31 Oct 2020 09:04:31 +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="rPE+iUoU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 89ED220756 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 EAB3F6B0036; Sat, 31 Oct 2020 05:04:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E83636B005C; Sat, 31 Oct 2020 05:04:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D23CD6B005D; Sat, 31 Oct 2020 05:04:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0026.hostedemail.com [216.40.44.26]) by kanga.kvack.org (Postfix) with ESMTP id A56A96B0036 for ; Sat, 31 Oct 2020 05:04:30 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 4D172180AD806 for ; Sat, 31 Oct 2020 09:04:30 +0000 (UTC) X-FDA: 77431634700.19.plane50_4404bdb2729d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 303991AD1B2 for ; Sat, 31 Oct 2020 09:04:30 +0000 (UTC) X-HE-Tag: plane50_4404bdb2729d X-Filterd-Recvd-Size: 5444 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Sat, 31 Oct 2020 09:04:29 +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=dg723lnpWwNTxY9ABCjUoTAWt08WeAMzn07QoHNZtdY=; b=rPE+iUoURvcX2caUdfem5LlykZ kyPM2JEYriA1DLC1gDnZmLc/R1XPQmrgQ+ZXDMbyG49cWcPfAkpxyPvEf/X1V4ZyGvDyUJcZS1S3J rm5DyhcN3+f6xhU3ywxEOlJjPX31jywIOCenUm/jwtd+mTi1gkKR8M11TtdixRpjkD9wBwU8EPrYi nOiIZAQ9Il5fEyhvUta8zvVqx+EkZyCFlZlB4K4Ffjks9w3LyDe9s+xqVMRUt42XuBpaXa4CVO48j nu0/eicU/avxbITINhBURcvaPiKOy3xugRiYFIajQv+/PQFSv7/Owqn7ElN/4Tj+ES4HS5NSUaZMO SANv1kSw==; 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 1kYmoD-00075v-NF; Sat, 31 Oct 2020 09:04:26 +0000 From: Christoph Hellwig To: Andrew Morton Cc: Kent Overstreet , Matthew Wilcox , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 01/13] mm: simplify generic_file_buffered_read_readpage Date: Sat, 31 Oct 2020 09:59:52 +0100 Message-Id: <20201031090004.452516-2-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: Stop passing pointless arguments, and return an int instead of a page struct that contains either the passed in page, an ERR_PTR or NULL and use goto labels to share common code. Also rename the function to filemap_readpage as it is a fairly generic wrapper around ->readpage that isn't really specific to generic_file_buffered_read. Signed-off-by: Christoph Hellwig --- mm/filemap.c | 66 ++++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index d90614f501daa5..2e997890cc81c2 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2168,59 +2168,53 @@ static int lock_page_for_iocb(struct kiocb *iocb,= struct page *page) return lock_page_killable(page); } =20 -static struct page * -generic_file_buffered_read_readpage(struct kiocb *iocb, - struct file *filp, - struct address_space *mapping, - struct page *page) +static int filemap_readpage(struct kiocb *iocb, struct page *page) { - struct file_ra_state *ra =3D &filp->f_ra; - int error; + struct file *file =3D iocb->ki_filp; + int error =3D -EAGAIN; =20 if (iocb->ki_flags & (IOCB_NOIO | IOCB_NOWAIT)) { unlock_page(page); - put_page(page); - return ERR_PTR(-EAGAIN); + goto out_put_page; } =20 /* - * A previous I/O error may have been due to temporary - * failures, eg. multipath errors. - * PG_error will be set again if readpage fails. + * A previous I/O error may have been due to temporary failures, e.g. + * multipath errors. PG_error will be set again if readpage fails. */ ClearPageError(page); /* Start the actual read. The read will unlock the page. */ - error =3D mapping->a_ops->readpage(filp, page); - - if (unlikely(error)) { - put_page(page); - return error !=3D AOP_TRUNCATED_PAGE ? ERR_PTR(error) : NULL; - } + error =3D file->f_mapping->a_ops->readpage(file, page); + if (unlikely(error)) + goto out_put_page; =20 if (!PageUptodate(page)) { error =3D lock_page_for_iocb(iocb, page); - if (unlikely(error)) { - put_page(page); - return ERR_PTR(error); - } + if (unlikely(error)) + goto out_put_page; + if (!PageUptodate(page)) { if (page->mapping =3D=3D NULL) { /* * invalidate_mapping_pages got it */ unlock_page(page); - put_page(page); - return NULL; + error =3D AOP_TRUNCATED_PAGE; + goto out_put_page; } unlock_page(page); - shrink_readahead_size_eio(ra); - put_page(page); - return ERR_PTR(-EIO); + shrink_readahead_size_eio(&file->f_ra); + error =3D -EIO; + goto out_put_page; } + unlock_page(page); } + return 0; =20 - return page; +out_put_page: + put_page(page); + return error; } =20 static struct page * @@ -2291,7 +2285,13 @@ generic_file_buffered_read_pagenotuptodate(struct = kiocb *iocb, return page; } =20 - return generic_file_buffered_read_readpage(iocb, filp, mapping, page); + error =3D filemap_readpage(iocb, page); + if (error) { + if (error =3D=3D AOP_TRUNCATED_PAGE) + return NULL; + return ERR_PTR(error); + } + return page; } =20 static struct page * @@ -2322,7 +2322,13 @@ generic_file_buffered_read_no_cached_page(struct k= iocb *iocb, return error !=3D -EEXIST ? ERR_PTR(error) : NULL; } =20 - return generic_file_buffered_read_readpage(iocb, filp, mapping, page); + error =3D filemap_readpage(iocb, page); + if (error) { + if (error =3D=3D AOP_TRUNCATED_PAGE) + return NULL; + return ERR_PTR(error); + } + return page; } =20 static int generic_file_buffered_read_get_pages(struct kiocb *iocb, --=20 2.28.0