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>,
        Peng Zhang <zhangpeng.00@bytedance.com>
Subject: [PATCH v3 20/35] maple_tree: Remove unnecessary check from mas_destroy()
Date:   Fri, 12 May 2023 14:20:21 -0400
Message-Id: <20230512182036.359030-21-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?LltO/dmXcXP397/OWer8c0Q6efunBrIPIEOy9daJKMLXp8+atSNJlWmMWpvD?=
 =?us-ascii?Q?R8ZWbKNWFOv5+5dkXUIBC3decWhhpY1QYHFxcTVbNlhX2aJ8CiG5KqMXdQEw?=
 =?us-ascii?Q?nwIlITU42MdQu1RSpU/B9c+hS/h37X9A4dW+BiucLP8L9TAy1q6qZP18DQD+?=
 =?us-ascii?Q?ramY7U8aUKRJsIgt0pHKY69SJhECzO3IApiP+L+pqAENjHqKF/ivd466DN5n?=
 =?us-ascii?Q?bDuG539tPHdiCYiOiyBoyMqhzRXeH1zyGuM6FaW5rEGW/f08qZrDhmc7NYxG?=
 =?us-ascii?Q?4QTBQuGH0Uvt1TqgMAKb/q4akO2KQ0H/feLorKk6Xh75QCZrX+8u215TCoaS?=
 =?us-ascii?Q?cZFFxo6LlRUqFxfbX2uxph8aZ5ahoqpzlzT3he1RtRSynj24iRS2l697ZQbB?=
 =?us-ascii?Q?pSg/Q26VWbdPaeQYMYIwLMLVKakYK/6VJk7icQaIwfMChxedhDmFAdCcTQT1?=
 =?us-ascii?Q?K4yNW47DTZhZNf8lvFxWx7cNkZn3sGT/tfuJl0dXGCZo1Oi/PNd7nKyKfvv4?=
 =?us-ascii?Q?0+Q9lbLmXuPFmYI5Hys7CoA96JbuwRVUItemE0lCg6e+6WouODiyuqadzWr/?=
 =?us-ascii?Q?M2jEF8tliPrsdDogNzoAkaeNy8XrdBeul8A4E77tbuXA6lYscjqpvjZ5Pi0B?=
 =?us-ascii?Q?xhXLln5MibSsxvf+QsPTgTuOw7uAyMb9nnP0v9BHlFn8U0tdqlkqkFmnVh83?=
 =?us-ascii?Q?dbjx33bh9kGA8WSv3vba985vjaLk6hKTa7bOCvyDC0mTzZcpx1vU3cumXYe8?=
 =?us-ascii?Q?ZPUqo37dFkcFkMzZKXm4EuCBUuSsohwShmqEhHINM+X6btMt4Dlhjp9WMBbd?=
 =?us-ascii?Q?j+F9H4kx+AAZS+Pa2YjtYMxeOVujfRGLnJiJWx8sHUTz9H5+FL9qn5t8MbjY?=
 =?us-ascii?Q?l2h29trB8Ws6OlBle4wiHvbDC2Nn8aKoQHcXRbGJ3e0LwFb3gERA0FVNF7eM?=
 =?us-ascii?Q?V2iAH/WyBNyCQ1B8QyjwpSQhiBS5yRXb1A0wM+x4U3Y33IR9jENncPJCsm0i?=
 =?us-ascii?Q?hO84jQFV6pjj2E6vAqOQNZGFkX+7eDUlVOpY4Du9UQFLW4117Mgxq4KxoGRn?=
 =?us-ascii?Q?RnJ9ZGT71fmop7YbOUTKlTHDhgKng/0GhgcTE02usdf9SRSYiWsophtBkifQ?=
 =?us-ascii?Q?AUV9+caYCn1yHA3SRizRHgIsjxEJ1PHtWlCNPFd3yEs00Gn02rrXCXExN5ZP?=
 =?us-ascii?Q?EiqVmSwReFg6JOS73QPSVkSlgWIgLHujhcJuzMLsh0dQqBXRg1SzkyQIcWcK?=
 =?us-ascii?Q?crw0w6WxOjlWpGYpY66ZBeajI6gV0sGfwtBw30+1qPVBp1vczYWrgE6udUus?=
 =?us-ascii?Q?+zexY5obx26nCtC3Rhqy7wX5ibrn9FwXs1AbE5RT3ZzAeeWJ3+IZSwXYl8UX?=
 =?us-ascii?Q?ohKqpOeof9rUAvENpdSHaXniaQJ5PJMyA5311KVOqmK6QUlMA9whvuM1vJQF?=
 =?us-ascii?Q?9QJ4ukT9iNzVCifg3H0KdMxHhSlNLrGFdK8jlP3N2HO8i0qJWo7PsEUy0BbR?=
 =?us-ascii?Q?e3gEHxN8+R/ql0wc1MYxbn2tnZdwFtzYEUDKNMpdCsHK2FJkgijMsXY3pBtW?=
 =?us-ascii?Q?LojVbsZRD8yAlXJQk3aSZ7E3kZvnSP2w3Myf8Yzi5veYn3FGIF+b9blg+8oj?=
 =?us-ascii?Q?Ww=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?Eh+yf1k9kOD/xKcj/u93ghdkffYiSXdertA5gPeXuR4RGK1d+Tr5YPOqWhd9?=
 =?us-ascii?Q?Nz9yTaV4sDzwHdiDpu3bOrOttn/pljejxX0jCbpq4RFInnsL0jUPy8ueRGUl?=
 =?us-ascii?Q?7uePE/BQql1okkjCOUsjZ2p2PaJ/7GT7m8TsvXnLPTMvMuzPe6kRHfAGhB8E?=
 =?us-ascii?Q?ZkuHg5IEfi0B6FE24Gtswg5eJyRV8TZG8/Jj75c11uTU52b1mtQ/7b2uu5yQ?=
 =?us-ascii?Q?BmbcYQdrYRDwgadhhLKPHFLnDK64/QObpdI5HXDY1FFsWizUSyxfW9VVRek+?=
 =?us-ascii?Q?ia0fx+Y5RUmSXG+C5qXifGm0HNfECKmfGSpdT+AML2YaU2jRqC06u5b4y/aX?=
 =?us-ascii?Q?dX/wV2aS+jD6BX3FJnSc7xjn528Jn+oBtiuu0a+uOadddDt/7LBljQX3tcND?=
 =?us-ascii?Q?5YruDWQPCtzowAt99SgfKqb5gd0ATcxadycRWzjqPgSDq4vW1Iglt6ZfeK9t?=
 =?us-ascii?Q?ljzyTdkf1sWCxyaxdOxIVGJo8ep7VyJ8kvgs9j+O7unSNcxT/9NcObaVkg7w?=
 =?us-ascii?Q?vJCXsOW/ybbCLkJ9k93sS7T1YqH6gGYZNuvGX3FUlS8WOdZoCSRoRIsoc+Qs?=
 =?us-ascii?Q?DQDlrObbl8oxP94HPsJ8V065ibA7fH8DAKMF8s85y3wayTCft6ap1kRqrtBf?=
 =?us-ascii?Q?wNw3VlAO0BiK/3PPECPGuyWXuNIeT9oQLHSPXr/kAKXWR/8lm0/+o0Sk/a7y?=
 =?us-ascii?Q?fWymw04VdhoZvTjHAqTx9O6tQfNXG6fYumXG83gH4eKFuoHyoN+wmHkneCJb?=
 =?us-ascii?Q?x6VvGDmclQXrHk/N6tRif/5M6Ktb3ptBmbC+O1lPJgVYdhFikHMjyweRyMEN?=
 =?us-ascii?Q?3kHpwK35vzIllaN4ldvYDt7khCUz3HIF9rePlaKxqWBU+gIMZ7joxoIs2nwN?=
 =?us-ascii?Q?R6ytISPPLa2YK/bsYNEfd7TQs/vJM6GWMU/IGwtywrBfODUhTZZaZbvmYymC?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 39f0a56d-c222-4b5e-7b9f-08db5315bc2c
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:42.0531
 (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: OrkK9PWylWvmgvm+l0ikyjt03AZ2dOF+5JZRDu7sv2+1p1kA5+f3AIZs5uR1AUQnut3ZRHwNQINE6M7IRYHARg==
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 phishscore=0
 adultscore=0 spamscore=0 suspectscore=0 malwarescore=0 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305120153
X-Proofpoint-ORIG-GUID: i7Lm6OokkYgwRAHttKLOpwicgTT2viKb
X-Proofpoint-GUID: i7Lm6OokkYgwRAHttKLOpwicgTT2viKb
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

mas_destroy currently checks if mas->node is MAS_START prior to calling
mas_start(), but this is unnecessary as mas_start() will do nothing if
the node is anything but MAS_START.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Reviewed-by: Peng Zhang <zhangpeng.00@bytedance.com>
---
 lib/maple_tree.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 9f3784f4a5b7c..b3e5ae43ff8ff 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5816,9 +5816,7 @@ void mas_destroy(struct ma_state *mas)
 	if (mas->mas_flags & MA_STATE_REBALANCE) {
 		unsigned char end;
 
-		if (mas_is_start(mas))
-			mas_start(mas);
-
+		mas_start(mas);
 		mtree_range_walk(mas);
 		end = mas_data_end(mas) + 1;
 		if (end < mt_min_slot_count(mas->node) - 1)
-- 
2.39.2