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 7FCCEC433ED for ; Wed, 5 May 2021 17:17:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E6CEA6117A for ; Wed, 5 May 2021 17:17:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E6CEA6117A 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 5FDAC6B006C; Wed, 5 May 2021 13:17:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5857E6B006E; Wed, 5 May 2021 13:17:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 426986B0070; Wed, 5 May 2021 13:17:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0007.hostedemail.com [216.40.44.7]) by kanga.kvack.org (Postfix) with ESMTP id 2401F6B006C for ; Wed, 5 May 2021 13:17:04 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D79C152B0 for ; Wed, 5 May 2021 17:17:03 +0000 (UTC) X-FDA: 78107832726.17.6ECCA51 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id 460042000381 for ; Wed, 5 May 2021 17:16:46 +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=tntI/BWH7jiCZdi1d9Ln7aAQ15+XDFARCY4IlqxeH/I=; b=J2gdrZ7sYOp5BWmGpoLAxW3V83 fWbdcyZoczY4M/1Zb4GVZlRTLT6vSj/J7ke5v+eLyufj/7F8grrILefykLFQkX+CzcwZpmxe0p+ku P+4e8ydGSkA0+VoBVahGzq5PhxfF6o2UO2OLK+TGBKdeNIl2qPFcM09+0Lq3gEpybimXVM9J1FR4m 7U+PYELfv7LaVj1XXp648k+vT4GhoA8vom+6GbR5bc1XJCt3h2Zi9Ock4VgEPK4jkVwOxZEfjocI1 cydAnFRUc2KyVRykNKrPVN5DT2EsYqtxDz7X2zuSCtcuBUv2s9ZP5pjBqW4TeX+HmOqc8b4x1njq9 mKHyrB0w==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1leL5r-000dGS-J2; Wed, 05 May 2021 17:14:42 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v9 84/96] iomap: Convert iomap_page_release to take a folio Date: Wed, 5 May 2021 16:06:16 +0100 Message-Id: <20210505150628.111735-85-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210505150628.111735-1-willy@infradead.org> References: <20210505150628.111735-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 460042000381 Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=J2gdrZ7s; dmarc=none; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspamd-Server: rspam04 X-Stat-Signature: yam1kewr6jay1j7yqiwwihm4y5minog4 Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf11; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1620235006-599874 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 94d33b0a96ff..9f2d0df0837c 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