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 96830C5479D for ; Wed, 11 Jan 2023 14:29:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D9E40900009; Wed, 11 Jan 2023 09:29:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A41C7900007; Wed, 11 Jan 2023 09:29:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1FF3790000D; Wed, 11 Jan 2023 09:29:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 0B3F58E0001 for ; Wed, 11 Jan 2023 09:29:10 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CB474C01CA for ; Wed, 11 Jan 2023 14:29:09 +0000 (UTC) X-FDA: 80342750418.27.161E4AE Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf17.hostedemail.com (Postfix) with ESMTP id 4A9F040016 for ; Wed, 11 Jan 2023 14:29:07 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Zscb4R+1; spf=none (imf17.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673447348; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xm1Fxzrz0ns4lKtzFJtwY/4ITuGXi0DU/+c1DUN/2L0=; b=EiEEPHDXWWibj7DTeKnhWTSUPeQ0jEKlDOV3M8HUtzuvKD0nQFP7Lh8EU6+huc9oEk1Xrl +RJUhrag+OTUD7coqaVJpocQCukuGXQbMTGkOld1gydYURkHsde2iPrqZwndYBp3oqbkJL ZE07bW7AIzVxONvrm7iehIyFUTq59p0= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Zscb4R+1; spf=none (imf17.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673447348; a=rsa-sha256; cv=none; b=ttGrZLFkC/2zHtQ3vkOnXBBt/rdfZxgrwoSLMbXBO8pBPaf7N86ayv7oMJe1eoMaMUZ1aV qexTmMEPHcxgjAhK4R6+vLQ/WTMUZb74tj8W2DwkIJy6oRcbnttixQuU9g1wtxqCHaygAb hqp8vlUhkroKqIa9WuxMAJuKqJZp7Y8= 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=xm1Fxzrz0ns4lKtzFJtwY/4ITuGXi0DU/+c1DUN/2L0=; b=Zscb4R+10NwuCaikA+xO49j0lF tHPtBZT3rywnSzAw5kLesDkA/5789V7rnlir/+gDSLv7tYC6r8rBLmIjPfLjisXrupUpqmknEGRFi 1yd1ZTSwRoCHanjtGjMr6Q+kLw1o37NNFA3e3jL5qSqw12FHmfAPJj3kwOTxieq8e4zP7lU7xy9Kj Vq9NGk+AU7BaTvR8Hay1YBJ+GCQHJ/1DnbrxF7HaMg1v6NN0leYCftcvdc5B3IELkzBh5KSHEzbCE wN3GIT5xhvHQAq6Kb3uDwsFXHnxy3bnHq9SlDcH4Hdwcvjk1AvLBO97sEsRuGhMaqQ6oOJoZOZqhB xpLQPrQA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6R-004CZo-5t; Wed, 11 Jan 2023 14:29:19 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 19/28] mm: Convert is_transparent_hugepage() to use a folio Date: Wed, 11 Jan 2023 14:29:05 +0000 Message-Id: <20230111142915.1001531-20-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230111142915.1001531-1-willy@infradead.org> References: <20230111142915.1001531-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4A9F040016 X-Stat-Signature: giyc9t3yeus7rfi9nac8ysrham5o5d1b X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1673447347-292382 X-HE-Meta: U2FsdGVkX1+qWenAURqn04pRee5UK0kh1E8Fa9TtqsDppPJqPSn1gXXlMoShgv4FUdHKzdN0u/R6oeA8cp/3jeOZUYvoNDTaBY3jTIwDpRE0z7xadO4BxrflEZzp7t2mSPxOKT375c1bTQiHBfePwhTLjy/j9MrsFR3HvE7dYMBo/9w3GiXMGQcaaXKoFyslUMODxFMuexQgLY4S1moDS425Mwt+KKKR4Yz4Wm+YNK1Y9JMhyu0M3QD4jvoXjBI+02tyD/9vBsdNake1WJ6WZKfRdgleaxzyEU/gAmUN/3CCXuHu9kVyqvZqr44uplSwzvNcxwVqPD0QLRtGwEbC6FRnl/RSZmrcZBX783P6kgew+/KULxCrEI3HC30U/O6OdgDwkcp9itmU3Z9Zg6585z9E9HEgy/8fUFfJPHsxGwpv4+9wFz+BpeOpZLcQFX0xcGMPR5Fs7a8gnuMuvwjuqvSWdiYGP/v2W3oBWOogd+LfnpRgQQuGEts4NexSQAafsPx+RthkFcmK2twBt00N4fXiEV3WzcRLJz3Z6VaHxJhBgDoZ6xCHeBdOs55c9Xwbc2Bx4rg6IiHmVlIPE/EtW1QEtSM1iV0CisRyqJ2xScs3ba6SMWdE31nQv70mGZ8ocDXlINfhTrruY9DFLMXHFZaK6BSPR0IWNoEsl2+MwBGy01mxaLxoWywHItpMSTqhmL5qQ4m8TWBcy+quh2TKBfYaPBLdbQKNqJUqrwcMH35KYAaDl/07Uy4LSBCoE/8iZplKOT3Z9ELfog7L8TK8CAsDLgq1OQSGU+LW9sBZxh/Qqo4l2dTFGE4gpjnETii4U9nNCgrisSwi18ayAutz8rwyCadBRtWcgnpiv0jQ9/dWXa91HfXk8SkoH5PqOf6ATmS4mRXoUyRmIZLcBG3bI2yjlw0WegKbnMTQ2Q8tGYsV8mRNERs2uQ== 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: Replace a use of page->compound_dtor with its folio equivalent. Signed-off-by: Matthew Wilcox (Oracle) --- mm/huge_memory.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 9570f03cdee4..bfa960f012fa 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -591,12 +591,14 @@ void prep_transhuge_page(struct page *page) static inline bool is_transparent_hugepage(struct page *page) { + struct folio *folio; + if (!PageCompound(page)) return false; - page = compound_head(page); - return is_huge_zero_page(page) || - page[1].compound_dtor == TRANSHUGE_PAGE_DTOR; + folio = page_folio(page); + return is_huge_zero_page(&folio->page) || + folio->_folio_dtor == TRANSHUGE_PAGE_DTOR; } static unsigned long __thp_get_unmapped_area(struct file *filp, -- 2.35.1