Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v4 29/35] maple_tree: Relocate mas_rewalk() and mas_rewalk_if_dead()
Date:   Thu, 18 May 2023 10:55:38 -0400
Message-Id: <20230518145544.1722059-30-Liam.Howlett@oracle.com>
In-Reply-To: <20230518145544.1722059-1-Liam.Howlett@oracle.com>
References: <20230518145544.1722059-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MsKkEMMUPAnC7kqhfbzLuid2joXAkuK/2l+KWKmeVZtEd/pZDddD5yRdpLBI?=
 =?us-ascii?Q?Mb81e/6sex3ne1sUwC9uUiDbfCXcmr4XEfCn0wgB4pZ/NgpqAETK5h0492k2?=
 =?us-ascii?Q?gsNRe3ErDMgtzKj9lP0mNACrSf+6YEOE9WGTb0qVblStVSGWoSak9+Yh2ndT?=
 =?us-ascii?Q?SybNyXqCeLekrgzOXi/1LUyba1UEPQuyVvGjKuRarxcyEIKOFcgs4z5UtzaU?=
 =?us-ascii?Q?SWcJsNHqwsGCEFQLstSL8SjtjXiW/6G6I5RFo0xvbX1HIeenhWjweNeuly3X?=
 =?us-ascii?Q?oLd5Sn3/RcvZka2/Q5a2Q47rUrzFbFLQd+Th/41NU+zO9m/Qzdg3t35FjP7B?=
 =?us-ascii?Q?am0eMnfRH8TkJszfltZ6S/4fm2IowGB2sLlM4xv3tBlpO02CtPG5kCZzLj16?=
 =?us-ascii?Q?Pw7izlmCO8MVxCNQtymwy7t377LTKyPmicw4teRipyeDO6n31zmsAr3x3zD7?=
 =?us-ascii?Q?PGyMTE8OBnWI+OGAw49E7tQABKLs2Knhtda/9IRMHKt/WYv7b2blGOBs373a?=
 =?us-ascii?Q?KNsBv2dG16W817J5Gw+ydyX1LvNWoRLRKS8hjQYCphDyaHVj1nTvPSZo0agr?=
 =?us-ascii?Q?H+iGPN1Q/FvhlQgZSvVEN+MmsZu76lDKMPaFECywLvkizGSfLIEd9MtZYmxh?=
 =?us-ascii?Q?ZHzo8h9nRqznmDA4uvCrYaz/wrElynFW3RlRq3Vf3IjrcAqDU6ZcRPEZ3La5?=
 =?us-ascii?Q?/Wyyj1GqCYG/Fb/pm3HQmsg00o92EUECk10TtBOMYYswXxSdpHwDA4iKJPzW?=
 =?us-ascii?Q?CJNoRiwvuqEduV1d/YhlOL6rYz2wLzjjBohNMRzfLmFQkvZgA0KcEHJ/adw3?=
 =?us-ascii?Q?2QUAqlwV9DI1ixQw1lE4u3lunv96jpfBJOU78mpopCsep2pP7eGiit5fhFdG?=
 =?us-ascii?Q?dvST5N7o1wnfDGn8K4zRLcXnDOHt8w8F77TcL5uvcgpqcwyt+3cOJD72zfK5?=
 =?us-ascii?Q?6H5yySnJZ3jQxs/lhcQEj0if3JlZelgzl849iGbxSckt9JNhIc2SKlBwIulE?=
 =?us-ascii?Q?TGf5Ra4ytvI6io1cTRUTg/kwzV1/h6369s4HxLhwZBOzOc8dCbvn87iEvdPP?=
 =?us-ascii?Q?c4ygk1asduO81rhCBIBxR01EoVonakPFn8BG8G07hZzx9Zg1BTw7j79EwNBq?=
 =?us-ascii?Q?2Y/A/7hXwMwOuKDHli8tXDwQHYQEP8iKZ3seWfPIXKElqLcO6I4kIhFBKZDF?=
 =?us-ascii?Q?xfbuqA/0QBOM6m8PCwejNk/KkH7ENcEopccx4Oa7eSOrFZ6E0ifdxUTxskIs?=
 =?us-ascii?Q?5EX11eNzvYlseROxdhhi1Em3qIIEsYIhmNnkcIayqp6iHwttA8fO3f4farKD?=
 =?us-ascii?Q?/TM1g8un3cWrhel49XNIY/ZNHtN4k25eiLm2iZiaWupqtVmjOz4fDQo6MJnl?=
 =?us-ascii?Q?CGfF0bFTHidda/gAI8Zz6i6qVVEDXX0MuItHT0kiS+gbcJTn73jNBkICtzUG?=
 =?us-ascii?Q?T5ChnIRKc2zAmJbvYWvOrSsNQL2eAZE9eBnxj4nGmWOFt66zae25drLaaO5d?=
 =?us-ascii?Q?7GcI4zhSmJcZuWHyg6g7DNQ5Ut5Fl5W+JodyVhE8rkjLrUrW1j1eJ7HRR1I5?=
 =?us-ascii?Q?a3Jpjq5sM+UDSPgHwj3GTqJqxb1QmjP/fhsqxOTG2GlmZ96mjr/bZmq5NOUa?=
 =?us-ascii?Q?nA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: YqM7WHgn1DQ5swKStdlEp2d5VlzZ6pN7lWoyjdkxZQHYjHc0oII7B5lNRqyLTC/OKw0rxSgrojtuel9vzahhkzBj749dtdab19wgtGCqGMM2FeFUtYGpIP71EGEm1vex3GuaAa0p+aXSdQgq11gcmVDYAiOHX10FT0FopM3fWcfOPiDjBP+D0KuVZm7w7HCMK0EjExuwyTrGc/FR+SUN9KXhCFhTUwYWta7bNFEYW8OJpAEBj+R7PXj6pUWlcq1JR67R28hkrjvdoLOlUDYkeJBJPQOaiQpQ/sKOkeyUnziIYFOYdRr2PX/qlR4onX+5DWFq43j06+JQiHfYvtgkYtIX4rMFKP/g4QBAr4EFgvCNr6tpb41KWogYSWakwdiSLULoN1aoyaRSkMd5zpqknXp5q7mFCw/7Bl/nLxMb24HdWAx0TL5iAGxouhJ1Wa/tLPPVxUjrLDzy7njv6muIIegoUIkUAXNnYLv2KeljXkiGWjWl8ndwMWgrMsXg6r1PxOXbb1LYr3wcIN2E/7suErepYA5SgvqXPIaI/b5XhAtr9TKRb80sIQw3hCUIo3wd29raOpxJybbuQdgqsV7tuV0fKqWP2ECgCpzeqW741DTUjKb3LfQRmG27UybdLSvsnzwNnTTFADHhutfaS72Fp/idOBCEHH/tcw92P8umS7rhsIrWVo76EKZfEfpxV1XHk9pWs5a3xT//op5irqIjsROeTjFWWRtpOR8GbwcKgnsfKhcCEGE6OdPTypNUgFFg/dvwQVtjDP34utbR8h5FqlLxZmr+2BwvXuyd6oFv6AfbnXwVt5YJohMUrl/XgVLELFXIrdPOF2XobIHhigkn3WncrsoCjc8ZhWJ6asDiLX33gAeUUA42ZNhq9PSpbhtFZjm2TLxrTA/CFtxLvFemwQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dd711551-0b31-4383-f603-08db57b02294
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 14:57:01.0235
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: cMz5lKPJnnUtDJGjwhj4Eo6SzNRkN6UdiOiPBkUCs7gtLept1isA7gQSoBmC7TORe9lY/Csm9IJo9ez+67UJRA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7427
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-18_11,2023-05-17_02,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 spamscore=0
 bulkscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000
 definitions=main-2305180120
X-Proofpoint-GUID: 0lz_w9n5r3UYf7QH4OwgEWtPkTAYBtYP
X-Proofpoint-ORIG-GUID: 0lz_w9n5r3UYf7QH4OwgEWtPkTAYBtYP
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

These functions need to move for future use.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index b5df37be7a15..25748014fe34 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -4497,6 +4497,25 @@ static inline void *mas_insert(struct ma_state *mas, void *entry)
 
 }
 
+static inline void mas_rewalk(struct ma_state *mas, unsigned long index)
+{
+retry:
+	mas_set(mas, index);
+	mas_state_walk(mas);
+	if (mas_is_start(mas))
+		goto retry;
+}
+
+static inline bool mas_rewalk_if_dead(struct ma_state *mas,
+		struct maple_node *node, const unsigned long index)
+{
+	if (unlikely(ma_dead_node(node))) {
+		mas_rewalk(mas, index);
+		return true;
+	}
+	return false;
+}
+
 /*
  * mas_prev_node() - Find the prev non-null entry at the same level in the
  * tree.  The prev value will be mas->node[mas->offset] or MAS_NONE.
@@ -4676,25 +4695,6 @@ static inline int mas_next_node(struct ma_state *mas, struct maple_node *node,
 	return 0;
 }
 
-static inline void mas_rewalk(struct ma_state *mas, unsigned long index)
-{
-retry:
-	mas_set(mas, index);
-	mas_state_walk(mas);
-	if (mas_is_start(mas))
-		goto retry;
-}
-
-static inline bool mas_rewalk_if_dead(struct ma_state *mas,
-		struct maple_node *node, const unsigned long index)
-{
-	if (unlikely(ma_dead_node(node))) {
-		mas_rewalk(mas, index);
-		return true;
-	}
-	return false;
-}
-
 /*
  * mas_next_slot() - Get the entry in the next slot
  *
-- 
2.39.2