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 3FAFFC5517A for ; Mon, 2 Nov 2020 18:43:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B28BA22280 for ; Mon, 2 Nov 2020 18:43:25 +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="HyxiyGwg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B28BA22280 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 393A66B0078; Mon, 2 Nov 2020 13:43:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2695B6B006E; Mon, 2 Nov 2020 13:43:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 09A136B0074; Mon, 2 Nov 2020 13:43:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0086.hostedemail.com [216.40.44.86]) by kanga.kvack.org (Postfix) with ESMTP id C21456B006C for ; Mon, 2 Nov 2020 13:43:24 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 5AEBD181AC9C6 for ; Mon, 2 Nov 2020 18:43:24 +0000 (UTC) X-FDA: 77440351128.22.scene58_000c359272b2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id 2910D18038E6B for ; Mon, 2 Nov 2020 18:43:24 +0000 (UTC) X-HE-Tag: scene58_000c359272b2 X-Filterd-Recvd-Size: 6007 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf29.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Nov 2020 18:43:23 +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=bkzaNHacm07eY9PD61blsMkIGUR+U2cxbSYg2JzcjUQ=; b=HyxiyGwgx6A0ltc2kjP0vnfOhA BIjxrfBZysvV1VC0TjRYLcusCWvqQhd0SoqvKtD0kxedanTfSO61Q/m9jZVegvIfMT/iT9MOZUuRq letxeCZ7494gGCSFRWmqwOV3YfLls/cIBzrZgmSVZ8Nt9PBVUcGnfNN9QdQUrN+qU9EtX8mrIMDjv DaHJa8BPeKMaJykDH9EZK9euWyGEvk2QY3jDTvlimTJDzowJnWgbw3Ge/CUJOq/EITsGnU1zXAo9t e0JPXZLC8POzJWjsbFp2vyZ65IeUQX86y+gIQYEuA0VBZwgP4XcHL58SRHflMPPVA0G+l+0x+Y6u1 Fm7TYqrQ==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZenT-0006ln-Hj; Mon, 02 Nov 2020 18:43:15 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hch@lst.de, kent.overstreet@gmail.com Subject: [PATCH 01/17] mm/filemap: Rename generic_file_buffered_read subfunctions Date: Mon, 2 Nov 2020 18:42:56 +0000 Message-Id: <20201102184312.25926-2-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201102184312.25926-1-willy@infradead.org> References: <20201102184312.25926-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 -> filemap_read_page generic_file_buffered_read_pagenotuptodate -> filemap_update_page generic_file_buffered_read_no_cached_page -> filemap_create_page generic_file_buffered_read_get_pages -> filemap_get_pages Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 44 +++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index a68516ddeddc..23e3781b3aef 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 *filemap_read_page(struct kiocb *iocb, struct file *f= ilp, + 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 *filemap_update_page(struct kiocb *iocb, struct file = *filp, + 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,11 @@ generic_file_buffered_read_pagenotuptodate(struct= kiocb *iocb, return page; } =20 - return generic_file_buffered_read_readpage(iocb, filp, mapping, page); + return filemap_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 *filemap_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 +2308,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 +2319,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 filemap_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 filemap_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 +2350,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 filemap_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 +2384,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 filemap_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 +2461,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 filemap_get_pages(iocb, iter, pages, nr_pages); if (pg_nr < 0) { error =3D pg_nr; break; --=20 2.28.0