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 88686C07E99 for ; Mon, 12 Jul 2021 03:58:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3772260FF3 for ; Mon, 12 Jul 2021 03:58:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3772260FF3 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 592116B0099; Sun, 11 Jul 2021 23:58:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 51AAC6B009A; Sun, 11 Jul 2021 23:58:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3BC2D6B009B; Sun, 11 Jul 2021 23:58:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0098.hostedemail.com [216.40.44.98]) by kanga.kvack.org (Postfix) with ESMTP id 102B16B0099 for ; Sun, 11 Jul 2021 23:58:19 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 2ADD8204D0 for ; Mon, 12 Jul 2021 03:58:18 +0000 (UTC) X-FDA: 78352578276.19.66DD76C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id D295310036B9 for ; Mon, 12 Jul 2021 03:58:17 +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=whD8BIYkU+G0i4MWw2Fy5QwFbYfuUTYf1Xdd+TaDZ8s=; b=enMm3MwMkxEXr4urJP+HeqQWCf UvBVnte1pYgcJUsou6wVCN8vFExRO1jYnNzmTR0WXZvzGaWoundtE99SnrhDiZvhSsPdtaR0BAJXW vs2zaQucAlNXPnm6msHuPSLwH9zpsGwPL65NGbxR2c8J9Ka05qqdkLbhzLmYfuc1D5u3ApWmLyE1d dvSkECsOuAMw7P7uBhq1qVZIVCDzFVsTOwwEl7BqUdSDLFfpPV20yjaqYETcNiqpykr0aaFQmieEf w4HEt9wmNzWEHETgi2dY0L/VI7A10MV/8EgQvAEjnGjOc+4cCzHys5ID27peaxkf6xpxvpfBzLbzc 6RKZdoDg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2n40-00GqHa-SH; Mon, 12 Jul 2021 03:57:08 +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 095/137] iomap: Convert iomap_invalidatepage to use a folio Date: Mon, 12 Jul 2021 04:06:19 +0100 Message-Id: <20210712030701.4000097-96-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: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=enMm3MwM; spf=none (imf07.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-Stat-Signature: 5q83y3qs65z3a3s3m68j769jrcyziokz X-Rspamd-Queue-Id: D295310036B9 X-Rspamd-Server: rspam01 X-HE-Tag: 1626062297-377544 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 33a0bfb6f3db..1ed63e8cc727 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_writeback(folio)); + folio_cancel_dirty(folio); iomap_page_release(folio); } } --=20 2.30.2