From patchwork Wed Jan 11 14:29:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13096770 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 45241C46467 for ; Wed, 11 Jan 2023 14:29:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EFA9690000A; Wed, 11 Jan 2023 09:29:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AFFBD94000A; Wed, 11 Jan 2023 09:29:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2BFF8900005; Wed, 11 Jan 2023 09:29:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 02D51900008 for ; Wed, 11 Jan 2023 09:29:11 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id DB981A01A6 for ; Wed, 11 Jan 2023 14:29:10 +0000 (UTC) X-FDA: 80342750460.18.6D459A0 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP id 396D3160008 for ; Wed, 11 Jan 2023 14:29:08 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=WuFCtoL7; dmarc=none; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673447349; 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=fiJqAGhssq/2TqYGILm9QDcQEpK39OAP0z5tPzA/mtg=; b=fCe4Twdiv9NB8kkiDRwkUJo3XftGxI0MdpBu4J0+vrYGfaEiX35wzkXCwIPhIatHgmuA4w 8V5tTZJQFy07J6pVkUKrVdyW5/J09+yM6UioS7/1mjOVLZpDXSKBy5rhzmGVujgsxmbAjL bb+GnfnrGMtw5crg0BrUXsmA5iXSLgE= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=WuFCtoL7; dmarc=none; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673447349; a=rsa-sha256; cv=none; b=1Ac7qcD7GCBZevTY8WOf+H/ib1SPn2Sng0RuL1uNpZyLnz99VOQaXf5N9Pa2QY8jPy7VIf QeyCWX1dBmR//va6cl0GcRy8YsY6xFUDvZFDCfdSpOc+n820mwE0D9t+rwgwnAIaIeI5fy l1hY6iwPCkdt9DsIpPtQumilsZivNBs= 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=fiJqAGhssq/2TqYGILm9QDcQEpK39OAP0z5tPzA/mtg=; b=WuFCtoL7YEeTBn8iVX8HRjtGlr RlbLN4GD2f8Bc7XDlFWDfaSH8BUHHvEFAcl5mE1opI0yR2HYGyRR3tWwpYjBF1/7fxCkssrkzIaN/ TI/U0YLd8RC+CnhKcdN+ZZkfsmbR98bO4cp/gjLrNHaLX6gg7zNEL2KJVcK1dGHjAdmukJzgoklM4 J5Q3za9MICIwbVQpM2AVdL6BzwCc0u6ZfdLfgNrZeGdWnfvmmr3DzGIf1h+I6C1gJYWRDLIaBdyKw vvpmlB36hX78MQKT1Rjjj1kw7mS4cmNU6A+rH5pA3NRMDQwJ30oefGYAKWyglQ7JOryu0BaUNRd4p ZEUvZ1rA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6R-004Ca9-Fm; 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 21/28] hugetlb: Remove uses of compound_dtor and compound_nr Date: Wed, 11 Jan 2023 14:29:07 +0000 Message-Id: <20230111142915.1001531-22-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 X-Rspamd-Queue-Id: 396D3160008 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: xn6w7eserxnmxcdj5h7nosabysbz9np9 X-HE-Tag: 1673447348-412157 X-HE-Meta: U2FsdGVkX1/APm7pkvdMVv48Fmfb2ITQ9S2Qyw3V5Flb13eboiRDIIWXVr55D6/LKLnkJHw7oGvTJ4ICX7d2vArmf/iqZlZRuDrNM0qysGoK7neQ+HRDvEPCC/ZmtTJm23zNNul4KYXhXlijfz0lLeAhfEsTW2jnqjy3hNGADnL95vS2Psuc5WRNrtFo99t2hbV24tp3ZyC7P7QJLzP95Lq0wRpzIkjdEv67eU3GNHcaJr+dEKyG509c4mL5ydyzE+PjYZ5NYw3gkzYgq+yVeJNwvDHq6PgE0zkxMLmmTnNYohpAfQiTlUtgms4VzQLatJwfzXiqo4Va87Ru70dCKeaFc3PxQn4qG0XrmoK984HB7lrwvqU401J92s6qkYMPBXn/Eeh5VEf7dviHhIevcnnQqFQeowtd1BvlMmJ8rlHLLI0CpBetS8VXoTzVUAolAckRuq4aXH16IIFPegOvqsqDFmecuzjFwM8Q139SRFuDv9mjnSrPZG17wl0wGERrSFdOFUjqJW2fqbC0CQmZzcbL0znlM9nM9D9U5/2h5LxxZYzpRv9lmDMaqEX9kwaymPKeXLuLYBL03JKEN2Y6Nll2/cIvw6bY7MY4YiF0PokTbmY9ciSy+9tA8NQVOw9zZUj9+BXM2IaNqZEtMPprEomUiTlh7BPs2T9iWGtCctohJfzV4HdrR8+dtwFu5fLy7uSCIcxz8cr2ekHXtwYFcYPqOtooDxM/44+d92wm6HkYiR33Weh7+3YppdqMTIOD7pbB4qp/MJrJimUZ/FaB4IxZT7jwoZMTQ/T7+/zTdZotPVZuYli7/Ro7wdbAPSspS3t8d2VdSUNtKZ61E2P4miAMFgAw424qLGrF1Gv5ZsrlDGR3M98JAMGYMPdlQ82f5MoHiJnFwMqrhOBrXf2WXx0axr5ARpVmk7dlDfy/anIq+pXOAhXtYA== 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: Convert the entire file to use the folio equivalents. Signed-off-by: Matthew Wilcox (Oracle) --- mm/hugetlb.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index a68e0e597a8f..ca9e177b9c54 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2038,11 +2038,12 @@ static bool prep_compound_gigantic_folio_for_demote(struct folio *folio, */ int PageHuge(struct page *page) { + struct folio *folio; + if (!PageCompound(page)) return 0; - - page = compound_head(page); - return page[1].compound_dtor == HUGETLB_PAGE_DTOR; + folio = page_folio(page); + return folio->_folio_dtor == HUGETLB_PAGE_DTOR; } EXPORT_SYMBOL_GPL(PageHuge); @@ -2052,10 +2053,11 @@ EXPORT_SYMBOL_GPL(PageHuge); */ int PageHeadHuge(struct page *page_head) { - if (!PageHead(page_head)) + struct folio *folio = (struct folio *)page_head; + if (!folio_test_large(folio)) return 0; - return page_head[1].compound_dtor == HUGETLB_PAGE_DTOR; + return folio->_folio_dtor == HUGETLB_PAGE_DTOR; } EXPORT_SYMBOL_GPL(PageHeadHuge);