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:     linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        maple-tree@lists.infradead.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH 04/34] maple_tree: Clean up mas_dfs_postorder()
Date:   Tue, 25 Apr 2023 10:09:25 -0400
Message-Id: <20230425140955.3834476-5-Liam.Howlett@oracle.com>
In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com>
References: <20230425140955.3834476-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?kxyCAtx+u8Db1QzuDyL7Br5xmwLX4sHD4G3d2HZSQLaYaDDyOrGg6V2cRKhk?=
 =?us-ascii?Q?lnZlOPV3391M9G7AaCiA/6Tu4EYAqXVAj7vt+JncbrBKfXqS4dpqkEFzfyEQ?=
 =?us-ascii?Q?XqB8JvSFryYlliBQVDaaP9bllRC1Rn+pvNbN4cJSOC8UnCISSrDHWDs+9ZyA?=
 =?us-ascii?Q?WrFgDHjZc25DhSbsIqjbg1JWX9VpoYeAQ+vSITxb38cyEwzACPyPKGM0MEnV?=
 =?us-ascii?Q?s6sPU9iTSxHY8Z5bJwB0P6kjDWXYMFNFlGfg/ENyXj73VGWZGMdGsDu81XwU?=
 =?us-ascii?Q?Zbzt+T2+JJzMPe8kAkywxsld9VfLO8y2nuvcyLXgBStPk3A69n7kUUeMYOcF?=
 =?us-ascii?Q?QoopFxhInyBdNwzLjx6pnMSMTiHvfwE4X7e6CmdyvdUbkgtsS99U1w402Qqn?=
 =?us-ascii?Q?2CV2q5NhViFwZj8JmQprfI3C5RVM9gJe86jKupzSAcMFaXkvE2E1WmU6S7IZ?=
 =?us-ascii?Q?83xfgrgBEtcTiC6t4xxpfQmJH1YVU9IOK5v5Fg66J+p5Jg99JfZaFZYujtqJ?=
 =?us-ascii?Q?CLJd74w+emkMEgZmFMtFd+uwqNmgmvCsqAyIp7XL0Vpr9fny43L/d1GA07lP?=
 =?us-ascii?Q?9Ipt5twFiqDG4IVpeFJvOA1IF3Bd93x+5UOWnYREsn7NmPtYHe+uZ0FIzokX?=
 =?us-ascii?Q?v2miBh2cAWpMekgG7GybWHLZgnC3XM7BKrM5VM9n8t8JRtKGalibzAB/kIQQ?=
 =?us-ascii?Q?+NJLVtzynHbRSHa8/zzZ7IOAa1eciYsziK8WTp+ZFUDW51gzsSQbW6H4oNwY?=
 =?us-ascii?Q?E8YtSXjCY8cAyw4jEpnbEYnNoFQfwv6z8Dx2v9HmEzUKJc0DaTIYXRbcziAz?=
 =?us-ascii?Q?Xc3r70YOqcCnUOnC67LJ6gyG/eGyq5npMCnMy2ZNYmzZ0Z9yq9V18raXHkyi?=
 =?us-ascii?Q?UerIeGOvaxfhGibRmK8FiUjzRtxrd3zxwQuy9oxkFcMHRjgKFy9X9OslEdoc?=
 =?us-ascii?Q?9Tlixl6/wHafaqb5Mis2pj9CoWHhaUgUaL7j8Fz33zx1MIZ8cOalHiCxsaYq?=
 =?us-ascii?Q?pqcKz8kCrCfmhTilEmDBRjZl3gBc0fJ8OKcX1W9nD8U5DrxBx4LjLui+WseO?=
 =?us-ascii?Q?shui2SAD9WHzKwE/5WFYhyhGq84hyCWEIF/7fc1fSZBFXbVJTRUV6grWokOK?=
 =?us-ascii?Q?4t5TFi268qQPIwtB05xnWaULWkgy8mvOZBJks6tYjTuGkLMewsjgqDwnl8WO?=
 =?us-ascii?Q?U3MovvGIqIkCHtA4zIB8RLjrkZ5u/sfUZZATfDHIhBIlf1DYN+M7fg+X2l4o?=
 =?us-ascii?Q?cBSfFtdEgv3d1/uTCxz/BVwYdR4HrwQwu709ietIN0HTRw+ddXWWeTxBFRoM?=
 =?us-ascii?Q?S66MnFQQEx0uNdqMugVL9+OguAaiWuDXtmrZSJ7vte3PWwC08yZdrMBKMmmI?=
 =?us-ascii?Q?IFhZN4IZPao12SFzcBY3+5zkVsBW7OsglHQkSq9Q8c4gKF4u4MF8m769+p4p?=
 =?us-ascii?Q?dgJdz/APhl1Bfpaq3VD2s6gWnaQInLIq7KILNBFSlmo3YKF4y7HORgpEOhwz?=
 =?us-ascii?Q?l2idN/Ihfhi/JYdiepbPWF5GU14Ce0uwoR7QVRFRHHwbx5dPtuePMcmsSYax?=
 =?us-ascii?Q?RsJ13uvjPTduzaB1T2JxT6pvhy8YJXiuGOuIZXXat+oMmeuZvy5TdkrwSFvu?=
 =?us-ascii?Q?wQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 6APGUy/6I7vqNcdJHpQ0KwOiRFr6x1pbm29J/v5+fdLHKAmhEEFzUdXOYQX1I2Nd0iplD01Ula7ZIM5kkYQPWePqwOb6QnYc0/21cE3qanNFx0CINBRoLUkpKqS1EYpgsEZ1SHHTtaxMN6h1VxmK+s2OzD3JKfRO0/0cRpndHhRhZ0AniXvPdPH8243b5D4MBtKtJLh1ZXXe4ZBOwK62VqCN6SX4IEgd/u9abjlTcUvvFuFZelB124sCEhY9aPR1QEcH68p3SPBWFCvTdTCMqqeKCYhdrGh1tpdVi4VSbIsm1qY3GPgZG1AgQz7mcFd/ZOqvs3sTNFLYhxvatgKSjEy8x+1i0c6Db3SF62zER2yMdHOoqmhwAepnYHT3v7GWCZIMd9KmrXaEo3WP+73i5zpgjxxTDmXlaWaLxNozrTNRdCxJdBv0ikbmoNyO2flijVqB07djnb9FAp3enUvT+LA9RozpsxHajWRtdzkZZKkYxr8iZ1wo1dpqhE5NqQ3v4TtlctgMV1ag8yV8bGoJFFgMjajlNSf14o2yJT6HnM6gmihifHMmSb+ht/Z54yWrBUI6EqyNvozIEg9HRgumx+p4W+DCx8VHDcLjdFYy3mLPqSdhF5cCr8K/6LBZT0kc03q7BE7044IJ9aOzE1TnfMVHwyhYsREbLgdRQkf87D2uQtSQXerUgI1ofBiAFsjsKyia1d0+EKdSOZrC9+MCkZI/oYL98Jy5SfT3+HptWIs1P/cF7p+uMTIVT9IUi2E+hTO3T027yskvxzmiZKAbUJ8MecuujyP5v8T6w5/lOWq4bRIfr9DynqEAmFp0fpT783fIkV1qfzmi7QXLYOyVfRn3Mrst2lDdvIDOGSqYDycmZCvTtWwP0Zm+wucqI2jXBrLuycQdH9d/WGIyTWcUkw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bedcb2c7-8e45-4c4c-e780-08db4596d31b
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:10:29.3438
 (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: 1x/9hgqpXCuPycVrWTFYungAKfTGUMHhm+bHlta51dPidddZwVsTIVK1pF4Y0EB0+GGo629QhVF6dUEjCtRWYA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6081
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-04-25_06,2023-04-25_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0
 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2304250128
X-Proofpoint-GUID: SL-jpWtxVeWocq1cX4LrM9CCghPJsP9L
X-Proofpoint-ORIG-GUID: SL-jpWtxVeWocq1cX4LrM9CCghPJsP9L
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 60bae5be008a6..dcab027b73440 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -6740,15 +6740,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