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 A4C58C07E99 for ; Mon, 12 Jul 2021 03:56:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4E74E61006 for ; Mon, 12 Jul 2021 03:56:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E74E61006 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 741D06B0096; Sun, 11 Jul 2021 23:56:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 718BA6B009A; Sun, 11 Jul 2021 23:56:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E0C16B009B; Sun, 11 Jul 2021 23:56:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0204.hostedemail.com [216.40.44.204]) by kanga.kvack.org (Postfix) with ESMTP id 3C2FF6B0096 for ; Sun, 11 Jul 2021 23:56:59 -0400 (EDT) Received: from smtpin36.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 6479A22AC8 for ; Mon, 12 Jul 2021 03:56:58 +0000 (UTC) X-FDA: 78352574916.36.2BD40C6 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 17FDEB00029A for ; Mon, 12 Jul 2021 03:56:57 +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=nU85zF1nDx72HhYeZDfb7+vVuafNLS+zF0KSCNOiAd0=; b=PWRyBcm0n3ra7pCnZlYfARcqto j93FoJJKrJC3o88WVvIJRe+g2NkNiDgd4kHaJ07dtps7IbSAkCKj0BU6MXtjQbrLQBOywCSQwgZ6x 4Vio5NLO9rLVHQ/I+V6nAelXrTA0dEQk6FzZkp4Qs77/7qAVsIasvZwzEhRUfxE7714qyM7f5vH5A VISxu8MVMrfODuANfjEz2URDnAdstmheY6QZRDTYMYeIGcFYK+CAbhy0OocOYvsJja0dwQhOUnmdT JHGZ4aoawegWu3VG1fg8DOfGCn/VYELuTd3ZvTXgfaAZe7VMcGXl8+sAMY/BxvLXngusNBepZtS2c lapTUwZw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2n31-00GqDB-J8; Mon, 12 Jul 2021 03:56:13 +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 093/137] iomap: Convert iomap_page_release to take a folio Date: Mon, 12 Jul 2021 04:06:17 +0100 Message-Id: <20210712030701.4000097-94-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 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 17FDEB00029A X-Stat-Signature: tssrqqf9jb6791edca556k1tiuhrr6r1 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=PWRyBcm0; spf=none (imf25.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-HE-Tag: 1626062217-92757 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: iomap_page_release() was also assuming that it was being passed a head page. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 257b15019ab6..30a884cf6a36 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -59,18 +59,18 @@ iomap_page_create(struct inode *inode, struct folio *= folio) return iop; } =20 -static void -iomap_page_release(struct page *page) +static void iomap_page_release(struct folio *folio) { - struct iomap_page *iop =3D detach_page_private(page); - unsigned int nr_blocks =3D i_blocks_per_page(page->mapping->host, page)= ; + struct iomap_page *iop =3D folio_detach_private(folio); + unsigned int nr_blocks =3D i_blocks_per_folio(folio->mapping->host, + folio); =20 if (!iop) return; WARN_ON_ONCE(atomic_read(&iop->read_bytes_pending)); WARN_ON_ONCE(atomic_read(&iop->write_bytes_pending)); WARN_ON_ONCE(bitmap_full(iop->uptodate, nr_blocks) !=3D - PageUptodate(page)); + folio_uptodate(folio)); kfree(iop); } =20 @@ -456,6 +456,8 @@ EXPORT_SYMBOL_GPL(iomap_is_partially_uptodate); int iomap_releasepage(struct page *page, gfp_t gfp_mask) { + struct folio *folio =3D page_folio(page); + trace_iomap_releasepage(page->mapping->host, page_offset(page), PAGE_SIZE); =20 @@ -466,7 +468,7 @@ iomap_releasepage(struct page *page, gfp_t gfp_mask) */ if (PageDirty(page) || PageWriteback(page)) return 0; - iomap_page_release(page); + iomap_page_release(folio); return 1; } EXPORT_SYMBOL_GPL(iomap_releasepage); @@ -474,6 +476,8 @@ EXPORT_SYMBOL_GPL(iomap_releasepage); void iomap_invalidatepage(struct page *page, unsigned int offset, unsigned in= t len) { + struct folio *folio =3D page_folio(page); + trace_iomap_invalidatepage(page->mapping->host, offset, len); =20 /* @@ -483,7 +487,7 @@ iomap_invalidatepage(struct page *page, unsigned int = offset, unsigned int len) if (offset =3D=3D 0 && len =3D=3D PAGE_SIZE) { WARN_ON_ONCE(PageWriteback(page)); cancel_dirty_page(page); - iomap_page_release(page); + iomap_page_release(folio); } } EXPORT_SYMBOL_GPL(iomap_invalidatepage); --=20 2.30.2