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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6681C433F5 for ; Mon, 14 Feb 2022 20:00:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2992D6B007B; Mon, 14 Feb 2022 15:00:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 221FD6B007D; Mon, 14 Feb 2022 15:00:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 111A36B007E; Mon, 14 Feb 2022 15:00:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0240.hostedemail.com [216.40.44.240]) by kanga.kvack.org (Postfix) with ESMTP id 04EFB6B007B for ; Mon, 14 Feb 2022 15:00:23 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id C0DC982E0290 for ; Mon, 14 Feb 2022 20:00:22 +0000 (UTC) X-FDA: 79142452284.16.6D2938F Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP id CB6D740014 for ; Mon, 14 Feb 2022 20:00:21 +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=nL1y+cA4P888mFebv8qG8FpJF507qBBYt5Z/9iNdM4Y=; b=vkimeCog77ITCjfBXHIHRBPhE4 LArEOJP53DqFtZrE87w1s8YrvKS1CeNdX5PCa2NBT6sej+SzNSllpnPB3y1N+TiBoXXamNcpmjXT4 BJr7SvqKP/YJGj7zNKQiEpHY6tHM/rL//OGa/2hsft7KK+3F73fF9oEiqjyjFKGhCGmKFqMXFSimw kkNIlmD+/6ElARfxKsr6oV3ncH0ZwnhATbYu60WTUO+PpVY4DC+lY83pGb+NsHYf5ld6DUAmwoHAd BHPHlBkmBatLN61su94noOSrqL4rOJQenecnM8IFLGYD5oaMD2oL+fd1AdUa+wscf04r3BySILcgE RMyMeQyw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJhWF-00DDdY-MN; Mon, 14 Feb 2022 20:00:19 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 03/10] mm/truncate: Convert invalidate_inode_page() to use a folio Date: Mon, 14 Feb 2022 20:00:10 +0000 Message-Id: <20220214200017.3150590-4-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220214200017.3150590-1-willy@infradead.org> References: <20220214200017.3150590-1-willy@infradead.org> MIME-Version: 1.0 Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=vkimeCog; spf=none (imf12.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: rspam07 X-Rspam-User: X-Rspamd-Queue-Id: CB6D740014 X-Stat-Signature: dof34jdb9tzf449xptygfuu5h9fbydyj X-HE-Tag: 1644868821-907040 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 saves a number of calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/truncate.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/truncate.c b/mm/truncate.c index e5e2edaa0b76..b73c30c95cd0 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -281,14 +281,15 @@ EXPORT_SYMBOL(generic_error_remove_page); */ int invalidate_inode_page(struct page *page) { - struct address_space *mapping =3D page_mapping(page); + struct folio *folio =3D page_folio(page); + struct address_space *mapping =3D folio_mapping(folio); if (!mapping) return 0; - if (PageDirty(page) || PageWriteback(page)) + if (folio_test_dirty(folio) || folio_test_writeback(folio)) return 0; if (page_mapped(page)) return 0; - if (page_has_private(page) && !try_to_release_page(page, 0)) + if (folio_has_private(folio) && !filemap_release_folio(folio, 0)) return 0; =20 return remove_mapping(mapping, page); --=20 2.34.1