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 21/34] maple_tree: mas_start() reset depth on dead node
Date:   Tue, 25 Apr 2023 10:09:42 -0400
Message-Id: <20230425140955.3834476-22-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?qxeKpFQEgsK8q++75o0XRPi3QzeX6iubDanujPc2reUJgwdrtoRHJLW8Hk8m?=
 =?us-ascii?Q?lrugWRM61zIQneXLa8hwBw2VQEoiIh5bKmWHQTt81WsRtOZHi40OwR7GpPpw?=
 =?us-ascii?Q?HRkpJ+i0AO05pZq9sIbPmBaXcNTWu5TrTFj14AcNDX6sthWU6tjFv8PzBGWU?=
 =?us-ascii?Q?W5Ckb3sVrEvual9iOknz37oPW3fxdqG7mlyUrABQoRYSrrU54JoQA2DBiaRP?=
 =?us-ascii?Q?2SAxTDaTblj7L0YyGuZl8MmNXiUxNI8yZXhphDT9hrSA7W/5f2X4FqXcYWBZ?=
 =?us-ascii?Q?o+m3K5u5NljHeTVviOXArDR/RbeKLioThb5ZTwaGnH/iiegwqYACqmhwjbsD?=
 =?us-ascii?Q?QB/kQct+ZKPy3qhaeRqwrNf/jctOCYTPmxL4y6LKdPonWEO3fOAx9UnKByvb?=
 =?us-ascii?Q?8x4q889v7qGHkb+LiNkIr1rf+n7tzHk3lc21NjV2npaNER30VShQNrg/4KmQ?=
 =?us-ascii?Q?nZWIiXscc7WJMTmD21sZ+oqHwlGI9RlIjSVwePjC5oz/NRG0qg9L2Uj6l/Il?=
 =?us-ascii?Q?v2SNHLHLhHNJ0r7K97vjxsNPM9C2tQzeVDOs+x5RRT4CuFmYAsyVcCfqDNj0?=
 =?us-ascii?Q?636r2ghPDAKA7yEt8CMx/v0pB31WnrmJAxQqoag5SvIHoMRrar067kx+T9co?=
 =?us-ascii?Q?mhD8lE9Kfgtb0PwHhiWluuWBU/OpWErfMCA7DrCpxQy3+pV1K040vx6UT0Zd?=
 =?us-ascii?Q?Wbg36HFIkr7u3TbArmABkt6sM+ZGSiMcMxEsAhd8nMJTzHxHDOvZGjZnBPyb?=
 =?us-ascii?Q?YH1hpoP+XSZnseVxy/TQ6obFCG6UX7vO4b2t45BiL7rAy6TWo2P+UGN+WFLH?=
 =?us-ascii?Q?/lMvspI7+oFReLI0WUYVJbd8wQKxU7IOFv0tKmFxVc+nzz+eJeEEPopP3yRC?=
 =?us-ascii?Q?igBYBm9VZNcX5xzNbE/TOJJ0Fh4OH8Z7YF/XvkRXa9CfhfJI0dDyuW8uglOR?=
 =?us-ascii?Q?xfdYrG/RjtZBZ+pG6NvT9f+6CCdM+KHjeA5I3Hxz0nHzIuL07vwXT8ENweFO?=
 =?us-ascii?Q?dZl+EdLaxwjCpIACTYRjsx7yAmA4UP4G7jINIup2SdiKrFxv94dqfpaNmL1G?=
 =?us-ascii?Q?fU0yBbmPTo5XG9dGXz5E66X1rKjeXBwVFWY63uPgQqHmnGQtJ4r5evy282ej?=
 =?us-ascii?Q?vlNMfxCO5yk+YCIsZ9Abp3Isic4aVAJqqnjaZktBLgGZldjrGtDXbyhzhHdL?=
 =?us-ascii?Q?PrXo42egw2kOg3tO4MPJygx6JRvWMz4wP4W+3u3T+efeF2xA8vK6ZTL3ooTC?=
 =?us-ascii?Q?vZHopkzKG1xXFhMMYoV4lPN7v72wF6De+ldsQW6gbSboPjCcLJjWMlaeNYb+?=
 =?us-ascii?Q?90PckiLt/BLv4gclKBjRxiWe5F6AOh14GjZkRp4WyObL0MD2kHkH3zQZUqNp?=
 =?us-ascii?Q?SapMsM6o+8IzlxZUcpYT4HQ0f5iRC0cr3rh5XL/z+HSXvgp8NG6lLP9y1Lc1?=
 =?us-ascii?Q?y0xlefs1jDXuL1C0wj4zu6Xk57iGfCVyYi+901Pq0oYF/+oe2/olIFF5b8gG?=
 =?us-ascii?Q?Y2ZBvXuAhZ295TkImeEJxo3FD5teox7djDHDV0Gj6IYcXGSiBpCvpg4XdTlN?=
 =?us-ascii?Q?zViL7d+oBzzzyY2TOFi2BBY6khaH9iG/xqbt6T2zW4qeT4yBk0kpRi3vytQd?=
 =?us-ascii?Q?pw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ZUh2hfdNdKQwNJDv8HIzVZBD89FnqDV5ktzStler4GGaqK4hDg4WHd+7mOXaosi7xrsHHldsi/I8L6HzRjt2PhFi+sCSwK9kRPdlkcxOPLIUB7uKDGKNuJiz5IG23c1qtZVLKRLWK9YUwUBrzuz2JpyuQindpGZRcWBMkEL+99CrnEPu4kI5uIJq7oNtUYzq1n4Rhm2KUnsPQxkjDTGTlVbxs+qPULRxIbE27Gz7JVrgm1jw/LA2qaR+HbcgNGutXZw7+8rBMTTvn3q0IvZrTkXqdcTTbZrin7cH4zhOqIHds4/L8XoEmuejgG3Ec6Jf+TAaI0MAGj9nUZ+sG33gOR/tA8NfOayT1W3vFPUWTzlZexjYYNUiTdqAJhZ6lApNGv1UK7tuxf4oEzClNQPWU483GcNBuT0TdKbZEEe+gmeFIwDrVsR8zomKg5HOoBETjbECUFjY1tDg+3MCOxfPL6TXB5zhQvNyfal4glMbijRxAkuNukAPcqohRKILdGehtF4WeQH/PRFp1ZRY/I0q8/NZZASgb9UvpJe6ozO5IYnMv1ktdYow7wyU6j6NCCEhdHsfH0YcT+cQG28f+FbkVgvJhImAJjfbQyaaS1QJX1JSHN2JZXDwHUKHt3gMoguWVhxHhNm6Rc920G9TkX8hp7IzIK1YHtoeuJRG+ptHVql941tzUV0TAF3/KG9w89tAMxLJQIAlkLySEzYsIa4Gt13XyrmP8L+9np+5uBcZsDA0iOLQ3sm30P5VO8ZbzrIEG/nwhrx4LNxBoum67sJkAp1zwgArvgHrBh67DjOAkLxnZAkl681L2t/KVYDqzlFURUfoP7EoHrQ69Ij+JimkbzRfEWuUxX7ZTxbM8m5cpP/w2Ap4UzncuC0loFTrZ4vGBgh5ZweRRZZyKY+DytJ/6w==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7e9b0886-0df9-416d-70da-08db4596eb65
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:11:10.0794
 (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: mVi6jQ2lXihf0a/DwSfRRQC4vTRP+bb3GJoheCI2pJ/Z7fNkDfxpA4x0rWFsGkgEZmSpQ4ItyHgYf/5dRAfrPg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572
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 spamscore=0 mlxscore=0 phishscore=0
 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2304250128
X-Proofpoint-GUID: CQ_JprCwYgSqd0-Xfigb6jQnQawjOYco
X-Proofpoint-ORIG-GUID: CQ_JprCwYgSqd0-Xfigb6jQnQawjOYco
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

When a dead node is detected, the depth has already been set to 1 so
reset it to 0.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 35c6e12ca9482..1542274dc2b7f 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -1397,9 +1397,9 @@ static inline struct maple_enode *mas_start(struct ma_state *mas)
 
 		mas->min = 0;
 		mas->max = ULONG_MAX;
-		mas->depth = 0;
 
 retry:
+		mas->depth = 0;
 		root = mas_root(mas);
 		/* Tree with nodes */
 		if (likely(xa_is_node(root))) {
-- 
2.39.2