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 04/35] maple_tree: Clean up mas_dfs_postorder()
Date:   Fri, 12 May 2023 14:20:05 -0400
Message-Id: <20230512182036.359030-5-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?l8X6QelMcf1LfwQCgb/9v3LnyYhFcf84zP8etX8QK+65evsmcWSi+CRMxqHY?=
 =?us-ascii?Q?pHGsWb+9jKO1OZhDGMNRh8JT1hAzO7r5x3GF3eGltIpNRFUUpFeCL4gO0q2w?=
 =?us-ascii?Q?OZMbp9dLriL+idT7dU83q++r/zpf6VH44AM2cDR3jl9PCeNXiFBO8A6fKhoK?=
 =?us-ascii?Q?E+9Ez7fcW3Zx93iAZrdc2pG/SHtQH4hGMjBYo28Jsm01DFKfsPKNW+rIKlbx?=
 =?us-ascii?Q?/+iqLBYFO3dDJKdaOc4xtYMS8y8gzQnX9A7FGVMFgHhQwhO1NCnme0XUSUbj?=
 =?us-ascii?Q?z6CLpVunOHJD8Xtp64DcMF7lrVnK0qBknc8G1zfxTbxcqrma23yEyknoWPE7?=
 =?us-ascii?Q?pXJX8tdC/CX8jAYgep/+2Ci7IZd7UdzxX3cMWmzddhi5iMuP7R5SiFaTI9Zo?=
 =?us-ascii?Q?Tetdh8DxSQ6iK68xSQ+HjITbxnjMn+cCiMMDoIiMOu2zv8G4T4pBlQSmUJEg?=
 =?us-ascii?Q?I4YPKg7BELcSqN9Ar8QRj9ypV5w1Tir6zPwPAItBkwnmCTrRYv+stS67amTM?=
 =?us-ascii?Q?kToVVMWB3T2EPD0sN8vOGM4UbWRlKeqP2gDixorHPqncaQirupMq99gnO7xR?=
 =?us-ascii?Q?gpeot35J6d2Q9dba15iuq+FlLZJ61ZSwgUiLpAwvRsGoZwqnLMsaPlUHhb/W?=
 =?us-ascii?Q?ZOlZf0hD/cLgAFhEAePI5NRpvzHApPXA5ruKLfphdAQv7e06hnvkr3RqFTfs?=
 =?us-ascii?Q?t9du1m50MHfAwf6UZ0uC3xbVH+nB41sUIPBHRZj/P1FWgw3+8bKzIkXHVdRL?=
 =?us-ascii?Q?X8LfpEtWzKbiE119nKzd7ow4J7Z5JvygtJQoZDos9uUP6/M1ky/fcqM/APPy?=
 =?us-ascii?Q?IwV3GCislf+Yjb6tjy7c06kOtWe5RkMPIUHpQUt77Ibg16OEFfHx+NgBXJeX?=
 =?us-ascii?Q?fa7EboN33uicxZioNBC5ArKrC/3d6DahwQcUmTd6yg9quUihnpBnm1kK3K/J?=
 =?us-ascii?Q?7sTnRBApby1zb/wyLidHKsWMUrfDqTYPwxVah0XSVfyQQwA7Z9mFOtXGqG4S?=
 =?us-ascii?Q?DxeeieWfYb52BGWWGauodps4kVfGm5/mZzPgTKbqRiefaQPwv11djO0A7C7x?=
 =?us-ascii?Q?4Kew1F3dMFV+wGrhcVFE8qDVXZar1l1LUgj36ANyRzJ6+wpjPpQZke2PBEAi?=
 =?us-ascii?Q?ELoXI8iAwsfK+F7GaZSJyDo9cBE0rckgJR5CxWjcFMw98yzqExUGYKpQKHYp?=
 =?us-ascii?Q?7UpaNxOWjbeIsfB8J6v570NVnrXTkzWwd7OwDktHkKdvC5gQGgBnRXAqRWLT?=
 =?us-ascii?Q?ihDNIjJ9mAJiSiNCM3tRQ81hvIRoVv6kN6ZJTMB2GAPBCe8gFpDZtsP9UUcX?=
 =?us-ascii?Q?lPF9ZVnFZz+o27T5xCoqr4ZgKJm8CWn4gRbvH2q+QPNL54Y1C6HbDMpEOPJE?=
 =?us-ascii?Q?fImGxvWFhClQArCbS6o3SbJnRsko2dARt4HbV2QlJxyOFwnir22ex1EeRwiR?=
 =?us-ascii?Q?MwibguPdDay8+SbUc5fiDH9oU6zqouK8ZG2qrxqpDBM4oN+EajP/XFu/jRqi?=
 =?us-ascii?Q?ZN+UJje+ZEl+IT6uSNn/+m/KdYxHJa5LktEIjBTEgX20/8QeGXCHnYowYybD?=
 =?us-ascii?Q?QvxbLxIn7VzeHQQX9KL9u1w+/SQOFxybs+In/geLyqSVtF9SRucwZ2RX4zcT?=
 =?us-ascii?Q?Dw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 47zrvRpNWI83SbFrTj8fbJ273AqKwfvmVZkkyJ1d3Qe5a6Ci72gYvlNrN9UH2NeLaUvHXp6RS2/T8kxuFz6u7XTcGqQrUXT4UUBGzI35zPSGBr+pA67s64zMIHBx410Hvvw3av2l8GbmIperS6Y5hRfJEToX/w3tkSduJcV/ymS5WobvS732M3uLICFUoFUeNr7DTzPLrQrYQ61EyLfGw/80P/sznQ3Fxnulqj0Robtcy1hkBrIFSf8f2VU4JVhmuxBtqb5be2W/05zNnwUJd8/eIQgiGY9UlPX572IYodA7JgTM9u7ZBL7uxi351DLOQooX5DM9ZvBW+Co8swf3nqi5UDHx5IljkAqHbSTlcpmxJsTLo55Kf1w8kDRx+okkx7l1KvIP0XDTpiAoty4JmLpiKegPqKMe4SMAG6VPwgOhpZD72Sj6+fAUsB4P641wDt36lszko7DQNl6664uN9Qd9wCtU5oE2gGUY46W5GlS3amxROvs/RMJrqtkOf0TJod5Psqx5k/F3zuEzxsG4A1HbWRIubpnhC1+JVWpptUtOaN3xvF1djJmRCOvAMCn47fpPJB4wPUX+MH9IUvULd1dHeirW4/7FIPKL2yDGRxl5kt0hmesXZ63VDp9BaOLUM7aXtWA7ZcqS5c7DO+jaR21elXW9wP8IQwZbBS6VWl8tfKou3+joV+Tv9VgSVaAmVkE94HyKZLJmXSwoLGEKSR2EGplNEQ4Uc73W5fhb0R8Wz7Elu21sS8mNTgv1CakeKHEB2bck3e5C7OuBUbbWRGxTVpqgzuOc8tdo5scetHliexWf2gJW+nINLMd77VMDdQUzLqUFyJqITYTsZ9YKiIaTecY8zFEoB3fo0h0kP0+y3eedCiVQHkOOO1BgoXzXhwjkHP5o0/pjKuH6SA8HqA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 53d44c8b-4fc0-468c-1083-08db5315a33c
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:21:00.2232
 (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: BBG8Wqdk+CAC0C5O6w2epvuDhEbQ63esyoeiJptX/1g3uG8mfgZEesohwRdB85/IMuDFa48TBWmJl6/9vi2pYw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB6143
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 adultscore=0
 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 mlxscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305120153
X-Proofpoint-GUID: pdGR9WO-QTcOnBwEEPmPwXTzEYM6S1jA
X-Proofpoint-ORIG-GUID: pdGR9WO-QTcOnBwEEPmPwXTzEYM6S1jA
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,
        RCVD_IN_MSPIKE_H2,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 5b29d5a916f2c..1e7e7249a0cf2 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