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 v3 29/35] maple_tree: Relocate mas_rewalk() and mas_rewalk_if_dead()
Date:   Fri, 12 May 2023 14:20:30 -0400
Message-Id: <20230512182036.359030-30-Liam.Howlett@oracle.com>
In-Reply-To: <20230512182036.359030-1-Liam.Howlett@oracle.com>
References: <20230512182036.359030-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?gJJO1CfHOir5z6LqIB00TrJQ29ljAMoNFPyCnotCshPLPvwycjGxhBWRi2wr?=
 =?us-ascii?Q?uQGMQw+Aq05rSXkv69F3Yp0/cQb9jJJwDQsOfbtS+kqtwpAklATV/bK+XbDu?=
 =?us-ascii?Q?Srn3COk0PUc84PPOyK9KT4UiFXjEv5vxo/yUFKKmmKgLgg6+bhRE1RFDHISr?=
 =?us-ascii?Q?FnqUy+697Moei7sZU18vgLHpTcswYOjdtgIqYN8CjwSDkhtWoe7HEv7QoWAr?=
 =?us-ascii?Q?NCIrP+jl5pjSg78+sPzF0VUA1OVtVD2qIZIPcRq6ILEfymMoKazeZY14lm+p?=
 =?us-ascii?Q?8hr7oPpxFy7uQzAWWCT4cas/PhB7cu1GuJhDx77EVGdM73/K6uZV7MNTvQXP?=
 =?us-ascii?Q?8JXD36Ds0cW6MQ2dJLHwLyGukU1S8+dDgSXxNeLkgniLfBdySRGie/+Xi+zt?=
 =?us-ascii?Q?fC5Xm8AlI4ZV5tAfKhrFs6m9PdNfdAKlK00ev6voXHuqG+01NXNfkQhv7oPp?=
 =?us-ascii?Q?9amdEPhH1c0pyxpZxswA45Ca4JXqyXzFL+OOYRfsqB/E8lfBVU220yqT/Evy?=
 =?us-ascii?Q?tzEx++NDrLlGvwGNvB+IXzMWpKrXoRukQYrM59XXIC/iDEw3SZIWhOa0SJ9I?=
 =?us-ascii?Q?kzlxG50I4Pi0qLxfrqg/1QHvVCSLf4SVKaEVC3ZUEPVna+t38yNE5lAFoX7u?=
 =?us-ascii?Q?GDex+BnTM/57hTitffZyP3EvFgO/aiokSF8AubPoyc4PLtsUMeM0M8wBeANA?=
 =?us-ascii?Q?wWSdgPQpKi7w3hawXLXaUsnhH+omFbiinLW5I3WoyXz39Vjo+hE392jZVQuK?=
 =?us-ascii?Q?6PyMGarrvGniNxa0ZvUpU6zX9hjDW7InS5FopEOHhW6L6oWn9F0WhTi2MCtm?=
 =?us-ascii?Q?Y2Pt4heCgL9HbdyK2Sc7SJzBg2yvCWvB9fFPQw4lMZY2kSFHVEGzcSvxzt1P?=
 =?us-ascii?Q?aNYpzva9b5War6w2+u+bEKMTCq5OCjH5nO+A3zG4Gaudf0XoVKRHgI6GC1U4?=
 =?us-ascii?Q?VdSrtGkzUmY8xA55uQLsFKZfvclkl9HrZeQBA7vXF32INLRu5Q+KYRg2HYur?=
 =?us-ascii?Q?JAYyXqXA9GD8ScD+9z6vENXXsUfgx8KlNTz7cb4ITJE+J4YxzP4X0V2URt3K?=
 =?us-ascii?Q?jxQ3VU7X7eEn2pg6zKems3MFNs6D0pW3wrdMIPEY5dEdIIFG/wCwBUyUiNUe?=
 =?us-ascii?Q?FuGAAoYvoyk3JkPrAeN+DFL6ZZv1iIFUaHswjJ55Npi8xsI5SX2cCyH7sxKE?=
 =?us-ascii?Q?fGvYGPDCSi8MJ4PABY7f3fWOIkEwYy2Gsr6hOWtmp0h6/N3Gj24XljYJcmRJ?=
 =?us-ascii?Q?hySMG7WQ/6NROuMKkc3vvriXQOsjNnGbA+EPzLadqaR5t5bfbd+rgJSc0ZBX?=
 =?us-ascii?Q?eiKiQsOS54J7dpq7fom0xPdWFfpnH1c1QC1nFZG36jF8k5FEdDebsnHbJrue?=
 =?us-ascii?Q?pdCilOBh0Eu+6ZiRRWpn5QN61HGcvJ471qjH53BcWKLGWZJjjSn0TFXdU6wq?=
 =?us-ascii?Q?g4YhCVM9F1+shqPw2InmNAeVPc4Pra87monUgKirLMmfOH72+HmuQitPFmnF?=
 =?us-ascii?Q?Yk1to+eapRVTkbagftabm7rOiRNoOLeOqP2LTQhNr6toH0aD5iASzK/7k2Bc?=
 =?us-ascii?Q?cL+zlIeqvOa7u2UmE4+Uc4gLwaI23UuXpj70Hu6bLJFroC3yZDxMRsNI882C?=
 =?us-ascii?Q?Xg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: HjLvLo2iwLM8dhOBk5jB6IFnzvIWFN0K/TMXMcJEJz/CkDMKIfZH+WEOQZ3uHRfkJ5Z2VK4i8xb4JoamMgEzNbbssJci28WtDE6Yutyo0XgZ0EQs66rQGrhGr+KKkuIonOW6WeP6HEUoNgGqE/o1O2G8UclvaRyJuL5NUjQV1InANstT/ud0pWulH9wmE2KwZybtiql6iKgK0U35xWff4vfR07nE8zyjqkRDkrgCVF33sjgJqO11PXYIn70ZRKYAZYpsiJFyVvvsaoIqIpaIvzOJk/f519vXZjFqc5a2CnWfV1Ca0GKUdpR12J7ZGtdujusRo2+u1lzHCkIcKYWgZP4vt09cIex+wwtjbvBLrMQL7jZsARzFMvqgveCfGj4FgW97n86pBFRZm7TUMBgIVc87s+AeUemlHxET3awWlSazxFP/S149g0D+dz+8QQughZGmjwkDCuL6+Qfrrt0dKH+R9rLUGFObcMCWlJp494DBJpbKlEamuXkkrKM+p42jiuVEPNe/8TA/y+0U16hY2HtNZBROaWk4ZUIcKmGlLYS3/yl+izqBkj2YkWjvz8z7STwEgKNtd/P7SJnMiwwChjDZBguUP6H311+1+pjPK+mHzdsfxvkW/v76lF869zCf9KCO/jgsuZyQB2LCEIFFSbW/lXJAre1Y/mzvom1GRit0Pmd661SY57C5NK1dSvvzftVt6fpodbGU3Oj5+o3BuKxT23vi2KvKDZGBzdLtJnQP0xi1LoOCnabWBW2Q8Tepp54ZYKUgpzhGc0NWlrXd1Q00lTUdXZeZYIDLs+BdbMK5+z/1X7CUAEtkzon7nfayTKhWa8K9RcaybK77GwaHXknl8wnNzOgd4jcJLWLdn8qQi5uUr688+PwvcULacxJs0DP2qO0BIyQ4yy6bHQtuJw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: baab5718-671b-4955-1788-08db5315c9b2
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2023 18:22:04.7946
 (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: aZwji4qVgGazXVT++eVgpfvcxmKgNushUMGV8UHe1ilbqykXq3lB3heqPTdap0sUN0fTGkygi41ieCs8cQatWA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5211
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-12_11,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0
 adultscore=0 spamscore=0 mlxscore=0 phishscore=0 bulkscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305120153
X-Proofpoint-GUID: qP5PD0-t1bzF0cOQdCVGGfgbTd2gFRFa
X-Proofpoint-ORIG-GUID: qP5PD0-t1bzF0cOQdCVGGfgbTd2gFRFa
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 10b9471a80cdb..c69418b120179 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