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,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 4E91DC1B08C for ; Thu, 15 Jul 2021 04:54:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 94BD460FF4 for ; Thu, 15 Jul 2021 04:54:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94BD460FF4 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 E74F28D0066; Thu, 15 Jul 2021 00:54:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E4BF38D0065; Thu, 15 Jul 2021 00:54:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D147E8D0066; Thu, 15 Jul 2021 00:54:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0047.hostedemail.com [216.40.44.47]) by kanga.kvack.org (Postfix) with ESMTP id AE5258D0065 for ; Thu, 15 Jul 2021 00:54:27 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 97BB218463F81 for ; Thu, 15 Jul 2021 04:54:26 +0000 (UTC) X-FDA: 78363606132.09.B13620A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP id 48875400209A for ; Thu, 15 Jul 2021 04:54:26 +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=FfJ6ZNoiX29Han3ne7JZIAhgvMC58bjKSAKjKwLA6t8=; b=Et6pXsXerxU9QQvmuJhKjEA5+9 giU78V/mLazdex17mOh8Ya0X7dyndJ/IPtbjGpSLI7o0DRTt+UnMDPg9m02dG1XArhrGk2h9iCGQ5 nyEV93UF6KdFBKoBdQPaYwxhjiTrfSsaRi1htmnxrHrDRJGOBsejeUyMAMH2T6hLCokob+55dqmmr oUst8CaK7+deb3G8OyQOTikXz1R1Bp4dh+Zi8BWy9kLw8ObLwBSd68AD5FlgOXF7LqGNbH3Jx+gvw 15GIELsfQBboDpdvweojqr92KTJ2IzYPnB9o+HMdBJxFS4dV7A4T+Ic2aLpxEpsSszm6KpYSiJY7U T7qxNOGg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3tMV-002yzZ-Ee; Thu, 15 Jul 2021 04:52:48 +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 v14 096/138] iomap: Convert iomap_invalidatepage to use a folio Date: Thu, 15 Jul 2021 04:36:22 +0100 Message-Id: <20210715033704.692967-97-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210715033704.692967-1-willy@infradead.org> References: <20210715033704.692967-1-willy@infradead.org> MIME-Version: 1.0 Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Et6pXsXe; spf=none (imf18.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: rspam05 X-Stat-Signature: 9ofztwky4pjr4d6ypqh5176ym9jbppcz X-Rspamd-Queue-Id: 48875400209A X-HE-Tag: 1626324866-421485 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 an address_space operation, so its argument must remain as a struct page, but we can use a folio internally. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index abb065b50e38..6b41019a51a3 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -478,15 +478,15 @@ iomap_invalidatepage(struct page *page, unsigned in= t offset, unsigned int len) { struct folio *folio =3D page_folio(page); =20 - trace_iomap_invalidatepage(page->mapping->host, offset, len); + trace_iomap_invalidatepage(folio->mapping->host, offset, len); =20 /* * If we are invalidating the entire page, clear the dirty state from i= t * and release it to avoid unnecessary buildup of the LRU. */ - if (offset =3D=3D 0 && len =3D=3D PAGE_SIZE) { - WARN_ON_ONCE(PageWriteback(page)); - cancel_dirty_page(page); + if (offset =3D=3D 0 && len =3D=3D folio_size(folio)) { + WARN_ON_ONCE(folio_test_writeback(folio)); + folio_cancel_dirty(folio); iomap_page_release(folio); } } --=20 2.30.2