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 39F28C07E99 for ; Mon, 12 Jul 2021 04:07:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DBB1560E09 for ; Mon, 12 Jul 2021 04:07:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DBB1560E09 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 0056A6B009B; Mon, 12 Jul 2021 00:07:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EF7696B009F; Mon, 12 Jul 2021 00:07:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC1586B00A0; Mon, 12 Jul 2021 00:07:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0135.hostedemail.com [216.40.44.135]) by kanga.kvack.org (Postfix) with ESMTP id BB1536B009B for ; Mon, 12 Jul 2021 00:07:50 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id DD21018023916 for ; Mon, 12 Jul 2021 04:07:49 +0000 (UTC) X-FDA: 78352602258.16.9F7A568 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP id A3333E001810 for ; Mon, 12 Jul 2021 04:07: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=gwEaU4C2Lxlsi+sBHb7fyhnYMsy23bgEn1Bk1GkMXwI=; b=d7t2Odi9xuPooxfnWfG84fNow6 c43v77yq3TJWHSBkr5rGZJoF0716MyUGfQAWBU4cVIng9ORFXHBMKTUruPIs1XCFv94Q3MRQSRWp7 0rX6UoG2IjEZZv5EryzKHXRIwp6roUxfkAdgsSuUnIPI+ujq2Y9KS3SaGCKLuevR2LLVWmz84BnsF PL8dQ/np5yBzDcuYnV0S8aTp6wciE6aaCk0GF3zHil+sWzHQ7Ds9lXpzC1x/qEClbFRWSylTRoYlc ZDL+IgJzszSabwm5soBlzzf58jhLNgdROPajaBVDfmoh786G2ujcUaHSXlCVtoO3bzdV5EkCvrW8T 5mvUdmHw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2nDP-00Gqyj-62; Mon, 12 Jul 2021 04:06:58 +0000 From: "Matthew Wilcox (Oracle)" To: linux-kernel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v13 114/137] mm/filemap: Convert filemap_create_page to folio Date: Mon, 12 Jul 2021 04:06:38 +0100 Message-Id: <20210712030701.4000097-115-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210712030701.4000097-1-willy@infradead.org> References: <20210712030701.4000097-1-willy@infradead.org> MIME-Version: 1.0 Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=d7t2Odi9; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam02 X-Stat-Signature: fikk9ws5xbw3q3gh9qe9op85su7tt5ys X-Rspamd-Queue-Id: A3333E001810 X-HE-Tag: 1626062869-374325 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: This is all internal to filemap and saves 100 bytes of text. Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 827e8872d2bd..537d3026cefa 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2396,32 +2396,32 @@ static int filemap_update_page(struct kiocb *iocb= , return error; } =20 -static int filemap_create_page(struct file *file, +static int filemap_create_folio(struct file *file, struct address_space *mapping, pgoff_t index, struct pagevec *pvec) { - struct page *page; + struct folio *folio; int error; =20 - page =3D page_cache_alloc(mapping); - if (!page) + folio =3D filemap_alloc_folio(mapping_gfp_mask(mapping), 0); + if (!folio) return -ENOMEM; =20 - error =3D add_to_page_cache_lru(page, mapping, index, + error =3D filemap_add_folio(mapping, folio, index, mapping_gfp_constraint(mapping, GFP_KERNEL)); if (error =3D=3D -EEXIST) error =3D AOP_TRUNCATED_PAGE; if (error) goto error; =20 - error =3D filemap_read_folio(file, mapping, page_folio(page)); + error =3D filemap_read_folio(file, mapping, folio); if (error) goto error; =20 - pagevec_add(pvec, page); + pagevec_add(pvec, &folio->page); return 0; error: - put_page(page); + folio_put(folio); return error; } =20 @@ -2463,7 +2463,7 @@ static int filemap_get_pages(struct kiocb *iocb, st= ruct iov_iter *iter, if (!pagevec_count(pvec)) { if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_WAITQ)) return -EAGAIN; - err =3D filemap_create_page(filp, mapping, + err =3D filemap_create_folio(filp, mapping, iocb->ki_pos >> PAGE_SHIFT, pvec); if (err =3D=3D AOP_TRUNCATED_PAGE) goto retry; --=20 2.30.2