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 DC893C5479D for ; Wed, 11 Jan 2023 14:29:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B672900004; Wed, 11 Jan 2023 09:29:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B067F900005; Wed, 11 Jan 2023 09:29:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 471888E0005; Wed, 11 Jan 2023 09:29:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 599AA8E0002 for ; Wed, 11 Jan 2023 09:29:09 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 04156120C0C for ; Wed, 11 Jan 2023 14:29:08 +0000 (UTC) X-FDA: 80342750418.04.FC6DEEC Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 52FD9A0016 for ; Wed, 11 Jan 2023 14:29:07 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="i+N/Wkxa"; dmarc=none; spf=none (imf25.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=1673447347; 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=G5oV+bri3hYrpZpECQtheMeOQewtuwycnzyaDeAOK/k=; b=oCIEt5cAYM+cmc+yYudISY9KGPWm3w5jY19X+LoYfT9afmMHmonA/4PjC+R5H1ZVipyajA nwUycOIDfFVB+pQtPPj250z0QU9RoUQD/2xIwK2AO9CIOOMEpQUbPsBVnIezDgdquJhgpf A/dbd9p9dgSc+Xjgfn4rnMn6sUs7oP8= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="i+N/Wkxa"; dmarc=none; spf=none (imf25.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=1673447347; a=rsa-sha256; cv=none; b=T7rkoN1NN3pKfuz2aQTPaUOlGzp8EGRjgdc8gi9NHIh69vzeF1i+sQz2b2G8icaivDyO4t Hqd0j4jxn7rwOV/nl+NT7/9qDo+LUbquF3BYnh/Sbexn8mgcGH51b12d/JCBqmK8neYaYn qPTg39u985DWemdeljZdc0nxJJuxANU= 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=G5oV+bri3hYrpZpECQtheMeOQewtuwycnzyaDeAOK/k=; b=i+N/WkxaC3wYdpN/S8J/mfMnwE jMxiv46zKhGjN29ZExlZotL/nk4JpzzigPYVNdn6/9dv0I3qe0+uP9ILqUNf8AsSZpzBiN/HSR+gn BluTxegBzsKaHKme99inIexZZV3UCmbrUcAVYnlf22Zu8D6+Tk/lKuk2tRHa1nVW6nlyIcaPULz/v ms/CVUlAsXjHMm512QtwB0QBQxBlcOMmxTylLZIZtByLdsIrJE10/3WB9K+37SLouS8XL/xPT1KHg EXS+FfQTSSflvyC5DIiUqvnOG02mrE2sDY2v1N0dXFrus3FkNDAp37C8jseC+4+sBYlrRx6rfc5tw tmJPqmfQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6Q-004CYx-AG; Wed, 11 Jan 2023 14:29:18 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 13/28] hugetlb: Remove uses of folio_mapcount_ptr Date: Wed, 11 Jan 2023 14:28:59 +0000 Message-Id: <20230111142915.1001531-14-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-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 52FD9A0016 X-Stat-Signature: zxr8ohjp37zcfjpw36uqdp7wioryozai X-HE-Tag: 1673447347-56850 X-HE-Meta: U2FsdGVkX18rlteaq9NgxxH0vUnLDsIIxJG/k5ZphTTHfEESHL7GC5JBHJ9NtTEXhXnTjfG8ZC/YGOoAN3Y/xtNxAbfZE2ojcq2oTMfoRtwglQ7T0HkjZLXMZAOc8dPV0i2ddi1ujBiX/3v2T5FzNZge8YyKc2NmYfcp/G3ixHw4UmrjKGGw6VOle9JU8x8gXoepw2hD+LdmMysvX41VXLOn0ts2NcHBpVo6fg1u0yde0a5f88zSdP9CqW2FWTI72qpboKeqnWjFHhIbUkZrRiRETJlEqkTs5hVo0BreeIFzCLg0VEFNjax5vNrSD9Mls/gnxzfUOgMxJ/tY0Q3xGJS1xvsvBBt6rREf+tkK0aghNr6fvg2mvArByCsAQ1mdCyMevCBKUq0aAZQ0FxC2ZpogDpTsG9TI1Ee6iZieoXLdXf1AxpklwWiEKbqpcwO8eLJvoHHGRTydXgwLnFetPNZOPrGDhItaQBAXx7aMzH5n64YRvW7rjRnD9gH3VKPNgV3JlHic70LY2KDhFZb+YJ15bqO7Um9zQl33CHjv9GuXj3TiKvNZ4LNSqGNqte1dZi6xV+R/J6v/BHscJb2YWvAhirAUujwkqolownpvcx/kAzzV3i5uv6SdQFpQhUsHSRIL6ZSj7rPEtRpNSWLL5ms4cssfMTGsheBi56wnWev/lHvzp8rck7er3kObDqgCGkyw+435yI5t79oSjxaMjQvvZ/l+6QR5rcZ2OvyIudXErLOR9dwImJc/O0hfiRsQTRzazHLR5+pVKS/uVlQOxZxhawhTPZ0pMqTAAccASR9NggzUDFAbWBe2ke4jJo0Z7zSLdUjPDkE7h0i6bWcrOGA9yzuhWemXeFZhyh9MoWRw71fMYVFuhE1+Wd5m4PDXqStPGZsPY35N+a+Nr98wwW+Vt96uSG08p82lKKj9YNtwcf6gqMFybg== 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: Use the entire_mapcount field directly. Signed-off-by: Matthew Wilcox (Oracle) --- mm/hugetlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index c9702224931c..a68e0e597a8f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1474,7 +1474,7 @@ static void __destroy_compound_gigantic_folio(struct folio *folio, int nr_pages = 1 << order; struct page *p; - atomic_set(folio_mapcount_ptr(folio), 0); + atomic_set(&folio->_entire_mapcount, 0); atomic_set(&folio->_nr_pages_mapped, 0); atomic_set(&folio->_pincount, 0); @@ -1996,7 +1996,7 @@ static bool __prep_compound_gigantic_folio(struct folio *folio, if (i != 0) set_compound_head(p, &folio->page); } - atomic_set(folio_mapcount_ptr(folio), -1); + atomic_set(&folio->_entire_mapcount, -1); atomic_set(&folio->_nr_pages_mapped, 0); atomic_set(&folio->_pincount, 0); return true; -- 2.35.1