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 04/35] maple_tree: Clean up mas_dfs_postorder()
Date:   Thu, 18 May 2023 10:55:13 -0400
Message-Id: <20230518145544.1722059-5-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?e1weNKLKgppj7lJsrn7QK0hq13L+8ZRy8VgCwhyS5duG/B5I7eiTRy+exgb0?=
 =?us-ascii?Q?JVoVK6dL2qbBiDiC2kum+aqwRJHaS5o6QLvpaWuhbdEhh3sANNYGsv3Tl+rH?=
 =?us-ascii?Q?NfaY3MZjksDBbw+uGAde+dBwx0wObi94P+eM1Yw1juc9yIM4zyFsVCTIbLeN?=
 =?us-ascii?Q?xC/yT7WV4woqQV9YC3iK4Yq/GDhpKBkoVp5ogWdc6PMEWVOGy4r+OKi1dOAP?=
 =?us-ascii?Q?gKiDnnKr83NQ6p1waznAGgEFnWe3d7+iT/ETRCGqUEPcqhiaJjHqgW7A2f0u?=
 =?us-ascii?Q?z/8u1xiQDIyOIIZrB9CI+6+XuvHZgQ5kJLapKA4qSsTcoEZzzmZozeR+uhqc?=
 =?us-ascii?Q?7dzYwmfoD1Pli5bqaUhrP4GENWx/MEkcOgpm1lUHnsw0Uc938mhXtrek3jLF?=
 =?us-ascii?Q?mnIYbJDyNxHyXqbW0RCROxfSfYY+9+CNqecy+r8+b3In0sz+ziPT24sg5xK1?=
 =?us-ascii?Q?ysv1r6bNh6eGi5WCDbcQ9UW3YxSsVXY0Ahok/vqTMDHw3rfLOaNqvGtvQLnn?=
 =?us-ascii?Q?PxEmM9vCBR0UW4lVqgd6zz9srjI8NFxAWNDUUNuVtteTTYCIEtq5+Mol1rvL?=
 =?us-ascii?Q?rGNiQx1STMGmOggxvuI205Qgl7kshLkLNZ3eQrzY9aj7lNogxJ7x9qTbupkU?=
 =?us-ascii?Q?Pa5gr8DSH569dtma2fPBzUn4euceFkW0sF3WWBI0dY4cu1G+2NKMP/VtyukN?=
 =?us-ascii?Q?cok8SyFIrVMo2jui6YsjEbaWDKoa8BeIEgNCs5xlddk4Fq4ESt1H4lFsKrH5?=
 =?us-ascii?Q?ONmNg9APgoetF8YzQ0ovu4Hq6/gp2F+eKtDCQ/c10MlYYhTHEM8NSJM/iqsr?=
 =?us-ascii?Q?NOHU+5K0d9+kld16FuWAzw8123xrXu+aX+dgxX1l8UjyjRT5WtFz3mkF/ozP?=
 =?us-ascii?Q?TwxT0WalUpvEQJlCvXxhb4psBZ4uAskkuRF4/guVJ889LHNyF3Hvshv/iqzQ?=
 =?us-ascii?Q?iqf8S9RRYA2DMh4bmpsLOIRGWJu751qDCYIXqBtSU6lT3R3V93nR5NKR8IBm?=
 =?us-ascii?Q?MK08m2i2CWVtovDCaxcrI7iHpq5jRXYRCyZuGUpxUV4Jh5dkGrMWAdJUXvZb?=
 =?us-ascii?Q?Fqxknd/001Fe5l6kv7GioDSep4L99Ro1ppcPqMyTsZVuypHpG2xTBzKKcf7j?=
 =?us-ascii?Q?EGxP4pl70bKYpkyC0X88/yWCCz8mg6TPJMoFuV+7fOumbtKvv9dKFPYqCHT0?=
 =?us-ascii?Q?9a9J9XeYAZgeUqiJgivuAcC1JIx1uT2Gqt9ThNWC3+2cf+p2NzeNL3HYDrY9?=
 =?us-ascii?Q?lm0Xqo3lLzX8WM3eqZQQufMNQzF3SP3MSqPW7IBen/E3bft1bxFUJiDWlBdh?=
 =?us-ascii?Q?N5ZdwXoEdOvmSPDQbfBWvMhs8dZfVC6M2LGPXUkUtnlIgG0/jRVwzTzD2TWe?=
 =?us-ascii?Q?4nxDL05tu11U8LQnxsXxHPTatVbPAmXPOULmnKhhyLH9XH3aFFh3fKIlJ4CT?=
 =?us-ascii?Q?8hK3l07IkAYzndKadyTizHdw/J18mdTN3qSzWZGJunK74jmbNt3CUFJtXnv0?=
 =?us-ascii?Q?3v4ImysTxJHlwKuVknN/zhhmAEw0BF2X5Qf0P4C4aiGCX+SlasOs9rK9xD9p?=
 =?us-ascii?Q?yTPAHSAhlmKihmYgGhRy5pvHJdBuxibq1daaD348SbYEWLdy8bdt6Peg84/D?=
 =?us-ascii?Q?gw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: JGC5dcW9CzcHNXIgSx1/setwd7iHYuSr9Jny1rZh2UkEXLLnHV2okAGLrC8mOeRPS1tmt8b1es/A/u7m72j3WG4TcLdHtBpOBC6IZsQvJ6nldG2Hk4zmEh0PrBYD1mqetb/ZpM/VQMrdnJM5q0OVSdaRSqUIOs7lfi4tK2YuoNghhGQPC6Hz4mrdHfYPUWBRMSN1Df9tbmNHUwfhxc29SPb4l81uBSIt8wI9C+wdSVkCM5IglCcPv5ybX0VTo58FmpoONgPWQFZUdCBsBX6656aAS5iyj9xVueyXCIPfS++/T3ADvhJ2u1mGIureX2KaQUggsWBbJMa8MbGQay656EKxkneZ94Ajh9PhFH56PQYSE3pqh4I9GBVsJAqdgqy+9x07ueOxCUKI5C4XkTGwUKCp+XC8ZDZFifnn0vQmNGJa29W135chbH0GNUcIDAF+vPj7p9n7s6LxxTCCE+S08yqKApbN4U153MFvckgIDUE+Hys8jUlBhemyByEugwRsPyw64UHm9dN588VQV3W6G7ztM55bKSQX00+h0jz/owqYY+zHeEDEPz7SehXa/wjH9F8v+LboomE9ParlgqWn/oiuR4EOXhQQ6U1Dn5Y4gsqsFB8LeK30iWsIyIR4hE1/whnz0OF3iWARj2Vq/kLEOYA/i/7zJZ1s9GtoT+c2uRzA1naFT/ftUFbpfuQH0uXOgKj/yu2khtBI9Ndr3I4uXgHTvVqhqN2naZlxWSN4xhJJd0HkebUZpWnfGIscIGbV8joAEPxtmdQLdzoUAo40I935vu00RwRmacw2/0BCZ7SsmzMpw3ID+U0Cnk2AqSevQBanfLl1/9+9D7ReiR5DXlX19Rh2tTWPpwrxx9EAc86Oe9L0GDBxuu6Sl5S5Vwr63WWYs+GgOP25ENvFM/PBPQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1184db34-e5e6-4bd5-db9d-08db57affd73
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:55:58.7302
 (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: 9/BdJU6pbhVPTwS3P+yUwUxcCs/I+fYrpO72xrYC0QXJMsKUYGPTt3VsD0OIz/VKIdjk+tTXb/buNB4yaKU5ZQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4347
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 mlxlogscore=999 adultscore=0
 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 phishscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305180120
X-Proofpoint-GUID: SVv2g6y-nAsZHtPhTXCfHfpPbZIoebV6
X-Proofpoint-ORIG-GUID: SVv2g6y-nAsZHtPhTXCfHfpPbZIoebV6
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

Convert loop type to ensure all variables are set to make the compiler
happy, and use the mas_is_none() function instead of explicitly checking
the node in the maple state.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 5b29d5a916f2..1e7e7249a0cf 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -6739,15 +6739,12 @@ static void mas_dfs_postorder(struct ma_state *mas, unsigned long max)
 
 	mas->node = mn;
 	mas_ascend(mas);
-	while (mas->node != MAS_NONE) {
+	do {
 		p = mas->node;
 		p_min = mas->min;
 		p_max = mas->max;
 		mas_prev_node(mas, 0);
-	}
-
-	if (p == MAS_NONE)
-		return;
+	} while (!mas_is_none(mas));
 
 	mas->node = p;
 	mas->max = p_max;
-- 
2.39.2