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 93025C07E99 for ; Mon, 12 Jul 2021 03:56:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4136A60FF3 for ; Mon, 12 Jul 2021 03:56:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4136A60FF3 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 659036B0098; Sun, 11 Jul 2021 23:56:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 62F596B009A; Sun, 11 Jul 2021 23:56:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F70D6B009B; Sun, 11 Jul 2021 23:56:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id 2DA2D6B0098 for ; Sun, 11 Jul 2021 23:56:34 -0400 (EDT) Received: from smtpin35.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 4E1FF8248047 for ; Mon, 12 Jul 2021 03:56:33 +0000 (UTC) X-FDA: 78352573866.35.BD18605 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id 1B0FD90000B3 for ; Mon, 12 Jul 2021 03:56:32 +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=m+e2o85rI460fhbTl3FZ5R9L2ilagjO/tFqcS3xHTuA=; b=gTNdm/nLKJt4QJf0QA4ylhcRba ZNLCjU1SgxQ2+hpkhlYXi614VITpzc5Pa2zciIPczQZwGDSIJZvIgUsCHhe5HVWabQit26ThVYTmW Mk3kcoaNc0q4fvyrB0hze4DFgYqJxJjWpgnVIP3to6aPR69g05347pAB63wgEaC/sf2IqxtHiPJcq l7mhlvzi3b/uNgQDn2cFRzR+e8iB2A2/dKOnV7wngtOcfCUT+dZVyl0IOXl04UVy7Ux8/udxxKf8G JyLJJhF7sSZD8o4fhsvxuCBN2PxhDHyuGWBBnKlznCUZbUNsxhDkr15sghiX3JXEvAVv0rz884ESa 01Gee3OQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2n2N-00Gq9e-ES; Mon, 12 Jul 2021 03:55:44 +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 092/137] iomap: Convert iomap_page_create to take a folio Date: Mon, 12 Jul 2021 04:06:16 +0100 Message-Id: <20210712030701.4000097-93-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: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="gTNdm/nL"; spf=none (imf23.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: rspam03 X-Rspamd-Queue-Id: 1B0FD90000B3 X-Stat-Signature: 69j63sfg3hxrbkuhkposzf1pwswwq7sj X-HE-Tag: 1626062192-73212 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 function already assumed it was being passed a head page, so just formalise that. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 089e89d4c74b..257b15019ab6 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -42,11 +42,10 @@ static inline struct iomap_page *to_iomap_page(struct= folio *folio) static struct bio_set iomap_ioend_bioset; =20 static struct iomap_page * -iomap_page_create(struct inode *inode, struct page *page) +iomap_page_create(struct inode *inode, struct folio *folio) { - struct folio *folio =3D page_folio(page); struct iomap_page *iop =3D to_iomap_page(folio); - unsigned int nr_blocks =3D i_blocks_per_page(inode, page); + unsigned int nr_blocks =3D i_blocks_per_folio(inode, folio); =20 if (iop || nr_blocks <=3D 1) return iop; @@ -54,9 +53,9 @@ iomap_page_create(struct inode *inode, struct page *pag= e) iop =3D kzalloc(struct_size(iop, uptodate, BITS_TO_LONGS(nr_blocks)), GFP_NOFS | __GFP_NOFAIL); spin_lock_init(&iop->uptodate_lock); - if (PageUptodate(page)) + if (folio_uptodate(folio)) bitmap_fill(iop->uptodate, nr_blocks); - attach_page_private(page, iop); + folio_attach_private(folio, iop); return iop; } =20 @@ -235,7 +234,8 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, { struct iomap_readpage_ctx *ctx =3D data; struct page *page =3D ctx->cur_page; - struct iomap_page *iop =3D iomap_page_create(inode, page); + struct folio *folio =3D page_folio(page); + struct iomap_page *iop =3D iomap_page_create(inode, folio); bool same_page =3D false, is_contig =3D false; loff_t orig_pos =3D pos; unsigned poff, plen; @@ -547,7 +547,8 @@ static int __iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, int f= lags, struct page *page, struct iomap *srcmap) { - struct iomap_page *iop =3D iomap_page_create(inode, page); + struct folio *folio =3D page_folio(page); + struct iomap_page *iop =3D iomap_page_create(inode, folio); loff_t block_size =3D i_blocksize(inode); loff_t block_start =3D round_down(pos, block_size); loff_t block_end =3D round_up(pos + len, block_size); @@ -955,6 +956,7 @@ iomap_page_mkwrite_actor(struct inode *inode, loff_t = pos, loff_t length, void *data, struct iomap *iomap, struct iomap *srcmap) { struct page *page =3D data; + struct folio *folio =3D page_folio(page); int ret; =20 if (iomap->flags & IOMAP_F_BUFFER_HEAD) { @@ -964,7 +966,7 @@ iomap_page_mkwrite_actor(struct inode *inode, loff_t = pos, loff_t length, block_commit_write(page, 0, length); } else { WARN_ON_ONCE(!PageUptodate(page)); - iomap_page_create(inode, page); + iomap_page_create(inode, folio); set_page_dirty(page); } =20 --=20 2.30.2