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 E91BAC55178 for ; Thu, 29 Oct 2020 19:35:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3E49120782 for ; Thu, 29 Oct 2020 19:34:22 +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="ZQaQfChy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E49120782 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 5711A6B0071; Thu, 29 Oct 2020 15:34:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 45C7B6B0074; Thu, 29 Oct 2020 15:34:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34AE86B0073; Thu, 29 Oct 2020 15:34:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0111.hostedemail.com [216.40.44.111]) by kanga.kvack.org (Postfix) with ESMTP id D28766B0071 for ; Thu, 29 Oct 2020 15:34:12 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 80E653628 for ; Thu, 29 Oct 2020 19:34:12 +0000 (UTC) X-FDA: 77425963944.30.milk39_520f91127290 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 5D96A180B3C85 for ; Thu, 29 Oct 2020 19:34:12 +0000 (UTC) X-HE-Tag: milk39_520f91127290 X-Filterd-Recvd-Size: 5920 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf50.hostedemail.com (Postfix) with ESMTP for ; Thu, 29 Oct 2020 19:34:11 +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=dlYJ9D+4FGM52whGaN4YYn56NteR9ZTeFStm51rap7s=; b=ZQaQfChyypFbOCaeq1kooxG0AK GZwqatG8XukWqu+4VmwtRNtkd/wsOnJ7vSQB03Bo7a2pHeHYRAxsDgg0NWXQgoQ3d+A9B+1vN2l1F iPnHFN7a/OLWIEdJkanthQ2s0ZJW9v3GWVK5gnSQgN59fYlgJqVAsFT8g2tf4OUI2ReSunW5idUZX v3egWpe35i58nEvsIkgXdtoQoQDqu0PuJGGVU8fEqWKhhyx0AS6e3oTM9wkppsGdhbO00ew1nettS IIC2YsjcFrfRlOhhGHdr3CWG3qlb0i52R1FKyWYclfhLfvK8LwH+tby4DOuUiQU7Pp9DFLdoZqFr3 2bI0gTrg==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDgW-0007bY-O2; Thu, 29 Oct 2020 19:34:08 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 05/19] mm/filemap: Rename generic_file_buffered_read subfunctions Date: Thu, 29 Oct 2020 19:33:51 +0000 Message-Id: <20201029193405.29125-6-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201029193405.29125-1-willy@infradead.org> References: <20201029193405.29125-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: The recent split of generic_file_buffered_read() created some very long function names which are hard to distinguish from each other. Rename as follows: generic_file_buffered_read_readpage -> gfbr_read_page generic_file_buffered_read_pagenotuptodate -> gfbr_update_page generic_file_buffered_read_no_cached_page -> gfbr_create_page generic_file_buffered_read_get_pages -> gfbr_get_pages Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index a68516ddeddc..7bc791b47a68 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2176,11 +2176,8 @@ 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 struct page *gfbr_read_page(struct kiocb *iocb, struct file *filp= , + struct address_space *mapping, struct page *page) { struct file_ra_state *ra =3D &filp->f_ra; int error; @@ -2231,12 +2228,9 @@ generic_file_buffered_read_readpage(struct kiocb *= iocb, return page; } =20 -static struct page * -generic_file_buffered_read_pagenotuptodate(struct kiocb *iocb, - struct file *filp, - struct iov_iter *iter, - struct page *page, - loff_t pos, loff_t count) +static struct page *gfbr_update_page(struct kiocb *iocb, struct file *fi= lp, + struct iov_iter *iter, struct page *page, loff_t pos, + loff_t count) { struct address_space *mapping =3D filp->f_mapping; struct inode *inode =3D mapping->host; @@ -2299,12 +2293,10 @@ generic_file_buffered_read_pagenotuptodate(struct= kiocb *iocb, return page; } =20 - return generic_file_buffered_read_readpage(iocb, filp, mapping, page); + return gfbr_read_page(iocb, filp, mapping, page); } =20 -static struct page * -generic_file_buffered_read_no_cached_page(struct kiocb *iocb, - struct iov_iter *iter) +static struct page *gfbr_create_page(struct kiocb *iocb, struct iov_iter= *iter) { struct file *filp =3D iocb->ki_filp; struct address_space *mapping =3D filp->f_mapping; @@ -2315,10 +2307,6 @@ generic_file_buffered_read_no_cached_page(struct k= iocb *iocb, if (iocb->ki_flags & IOCB_NOIO) return ERR_PTR(-EAGAIN); =20 - /* - * Ok, it wasn't cached, so we need to create a new - * page.. - */ page =3D page_cache_alloc(mapping); if (!page) return ERR_PTR(-ENOMEM); @@ -2330,13 +2318,11 @@ generic_file_buffered_read_no_cached_page(struct = kiocb *iocb, return error !=3D -EEXIST ? ERR_PTR(error) : NULL; } =20 - return generic_file_buffered_read_readpage(iocb, filp, mapping, page); + return gfbr_read_page(iocb, filp, mapping, page); } =20 -static int generic_file_buffered_read_get_pages(struct kiocb *iocb, - struct iov_iter *iter, - struct page **pages, - unsigned int nr) +static int gfbr_get_pages(struct kiocb *iocb, struct iov_iter *iter, + struct page **pages, unsigned int nr) { struct file *filp =3D iocb->ki_filp; struct address_space *mapping =3D filp->f_mapping; @@ -2363,7 +2349,7 @@ static int generic_file_buffered_read_get_pages(str= uct kiocb *iocb, if (nr_got) goto got_pages; =20 - pages[0] =3D generic_file_buffered_read_no_cached_page(iocb, iter); + pages[0] =3D gfbr_create_page(iocb, iter); err =3D PTR_ERR_OR_ZERO(pages[0]); if (!IS_ERR_OR_NULL(pages[0])) nr_got =3D 1; @@ -2397,8 +2383,8 @@ static int generic_file_buffered_read_get_pages(str= uct kiocb *iocb, break; } =20 - page =3D generic_file_buffered_read_pagenotuptodate(iocb, - filp, iter, page, pg_pos, pg_count); + page =3D gfbr_update_page(iocb, filp, iter, page, + pg_pos, pg_count); if (IS_ERR_OR_NULL(page)) { for (j =3D i + 1; j < nr_got; j++) put_page(pages[j]); @@ -2474,8 +2460,7 @@ ssize_t generic_file_buffered_read(struct kiocb *io= cb, iocb->ki_flags |=3D IOCB_NOWAIT; =20 i =3D 0; - pg_nr =3D generic_file_buffered_read_get_pages(iocb, iter, - pages, nr_pages); + pg_nr =3D gfbr_get_pages(iocb, iter, pages, nr_pages); if (pg_nr < 0) { error =3D pg_nr; break; --=20 2.28.0