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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 7D9E9C433DB for ; Fri, 22 Jan 2021 16:03:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A099823159 for ; Fri, 22 Jan 2021 16:03:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A099823159 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 01CBD6B000D; Fri, 22 Jan 2021 11:03:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F0F006B000E; Fri, 22 Jan 2021 11:03:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DFD8D6B0010; Fri, 22 Jan 2021 11:03:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0113.hostedemail.com [216.40.44.113]) by kanga.kvack.org (Postfix) with ESMTP id C9AAE6B000D for ; Fri, 22 Jan 2021 11:03:26 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 95337181AEF3E for ; Fri, 22 Jan 2021 16:03:26 +0000 (UTC) X-FDA: 77733880812.27.key93_3410e4e2756d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id 2CD563D66D for ; Fri, 22 Jan 2021 16:03:24 +0000 (UTC) X-HE-Tag: key93_3410e4e2756d X-Filterd-Recvd-Size: 6316 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Fri, 22 Jan 2021 16:03: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=Nbi5ZwqvpfNoyWg2clLlXNPhBFB3kJ+6Hvh4lIGwZ/E=; b=iRAzJ6JycFyFh3zYptXJb8DWFa fXTvgDs25OJfwxkakbLiNU+B64KYHyJkDMuvor2E36MnBIhTElJYZDwj2G0VS+Cno1LIkBEx937XS ESDbNnW19ZqAuhRUHTaof/xEJDooyADFWMiabiNX+wFYKIEzz0Pijv/q7gjpWgSFBUaVNWQxMbsVk NXYxEgVL/tQs15xAYQW6VnOhH6ip6vo6TYJ6k3WBespUcvSO5e0LLFR1SGy013kBxmXjhm80OPUEK i8W4DtNb0hmSOYYzKn/Hkr0n1D1SmG2ivnytn8eVyCsH9c3sno6kru34FrkaHTgo4hr3XlXMZkPUB aMyw2yUg==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l2ysu-000w6U-BR; Fri, 22 Jan 2021 16:02:07 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Kent Overstreet , Christoph Hellwig , Miaohe Lin Subject: [PATCH v5 01/18] mm/filemap: Rename generic_file_buffered_read subfunctions Date: Fri, 22 Jan 2021 16:01:23 +0000 Message-Id: <20210122160140.223228-2-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122160140.223228-1-willy@infradead.org> References: <20210122160140.223228-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) Reviewed-by: Kent Overstreet Reviewed-by: Christoph Hellwig Reviewed-by: Miaohe Lin --- mm/filemap.c | 44 +++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index bb28dd6d9e22a..afc0f674f2242 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2191,11 +2191,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; @@ -2246,12 +2243,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; @@ -2314,12 +2308,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; @@ -2330,10 +2323,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); @@ -2345,13 +2334,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; @@ -2378,7 +2365,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; @@ -2412,8 +2399,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]); @@ -2492,8 +2479,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.29.2