Received-SPF: pass (google.com: domain of linux-kernel+bounces-206618-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org
Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com,
        willy@infradead.org, Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v2 06/16] maple_tree: use mas_store_gfp() in mas_erase()
Date: Fri,  7 Jun 2024 11:52:47 -0700
Message-ID: <20240607185257.963768-7-sidhartha.kumar@oracle.com>
In-Reply-To: <20240607185257.963768-1-sidhartha.kumar@oracle.com>
References: <20240607185257.963768-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?4Q/WtvBt25+8sYOL+1kU2xfvBTuHIgZEEry+5QRhQAoXs+6xW46xamjMnEtX?=
 =?us-ascii?Q?ragCTBjXtx61Aj4f+iX89Q/WNloXHIiiLL2skjswLsbxeTfaHfQ/v0CD1fw9?=
 =?us-ascii?Q?Z16JYNN0zM4vW9vtWc4wlEi15e+qjWDWcFya7zBk/0/WKI6q2eMCNuz/7x1S?=
 =?us-ascii?Q?V7UZK0NPLLpxuzVficVq/YmEoUU2NIHInU+jzZ0gF81/0T4B1tdMNBDMBAmh?=
 =?us-ascii?Q?EB/tVeXv28dQZrpdgrOJxauL5fm7kKlMA5qWdFmxOQmjUsqLl3+QdEkMyl1/?=
 =?us-ascii?Q?p++ZV6GjkDRM7PsDYBCeh4Tc7tABktkJggXEv0bJ0pzIkh4ZtS1a166baaCv?=
 =?us-ascii?Q?8Ip2wBKljxiOZCFXlL0njgq8gyciefDbolkd7Fsse87IaZrQRFkras2LSwKj?=
 =?us-ascii?Q?gQllyyuPpMuCquaOInDY/GEflcUjoOOhoqcZKMM15ONo5+xjGycWHmZEilr5?=
 =?us-ascii?Q?4vQuqh9l5eqmTYYjY2isnlaiSL5tEeWrUZpsGTUz5gGgSouXYA8aQE2hQ8hf?=
 =?us-ascii?Q?2tn+tgwCAsjpsvTY7GpiY9WDvuYPwemCOFRCqNHaUR0pgiZ2dKfWmos8FnnB?=
 =?us-ascii?Q?0ulQxqeDzG7NV+BHHMmSHo9L2YJQheLbAIAMHekeeMIRrQEig1INt4uXOgmF?=
 =?us-ascii?Q?k2MiCGMvr2lE7+56NdBKV8tfYxSPZTibOUmyJ4xIoJG0hebVcEUdjkOZrkd+?=
 =?us-ascii?Q?G4/rbzKu+H65la+Z2NEIi5PzJNvpaoVwGfp8is2ObVsvU6aoIqGBCKAtpoQe?=
 =?us-ascii?Q?TeRqDrwPVprbuoJVn6iAMS2kgJO3Qgs/l82ZGvg6wCIptr1aX4K7z1e1jYdv?=
 =?us-ascii?Q?3lcOJo0yuYDEkInJInO5i6qMgPVyFnKf5yQt/P2xb0viCN6sXPN+w6acyswS?=
 =?us-ascii?Q?1K3BUszOAnXaJlO+Qv2I9ZpHwvSIBMX58Je7hsF/RGEG7VkBPn5yGYtmO1ZL?=
 =?us-ascii?Q?vPLk2TfzL2rjSwKfcCheJv0AGHZ+W0t/84WjInnFYXZdLmEvN9jaqTaPsQBS?=
 =?us-ascii?Q?shu42vvG4f5/hOmZ7yiDEe7ZY+2yS5mdzQb33xCQr7IIPVj07Xog9qhlLr1v?=
 =?us-ascii?Q?RpAzn1bYRwfPsmJPkwl2hqSJ4Lrldp/NAWxSJeH6qu0YzgEw2iueLNxgGob9?=
 =?us-ascii?Q?Gaz1IfVqC1to0H0b7eGuy0wAe49wgjOMmX2B9uU/1hKlZibuEi1PLhTNnk2x?=
 =?us-ascii?Q?5f+gNTlYWoMBlX3MOL4Ea1cPx149Xt0t0HHbUMnVQOu59MEJc1jDK5BCFR/E?=
 =?us-ascii?Q?YQFumOsioATixxQfKyP6RRzd5bbptvFAFVUjzG2UFYnWSFJn+M8tzkzjzlPd?=
 =?us-ascii?Q?k06zAi7GeI87Hs4VX9hi1TIbVNl9ewjT2rfS8qPHSKbyyKh5mz0ht+z0+grF?=
 =?us-ascii?Q?oOGOBd0FZsvACPRaR9L0vl2J7NrJJIapBP90VCd5qQjH2/wUHh5c7B4JAoDW?=
 =?us-ascii?Q?7E9mLjVj0JSlqU8WwaAIPUBoLd3ra3JfUwhRnEXU54/gJ+suRfteJsg6ZIY9?=
 =?us-ascii?Q?SmMaUYZegCwUUKDBHgClVFLOMM4xpX/KXim/tBw+a4pXf6hMtz9gtbB8WX8V?=
 =?us-ascii?Q?UTF20iGPpoAdfYIrOVI7uZxOHyC2b8u/QZ+V/ZzXJSXg3+vNfJHG7yOV+kTE?=
 =?us-ascii?Q?LkAzPUzzPWw3q4GZHA0I3mI=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	SupnHJN8XovT8aevg6CtORIVq6UI8BGrWOogkb+gI3mYDi/L63oiEn5bTYJcZIjfZLnEnQOFlfKk0UMQJEiz4uh/HNjYq63SCRGYBDCzzUQe6O6bt1LuspXxe3fDjjhs1+v9gCX+mvPGDBU1T9oLeHpDngyeZR2UVJPb/5fJnzxOn1Bs7tXPTvwcTTnQ4T6shs2KSvRfvDjA6TatQTcPbGVrCkTXeJ6ESnFSach6jlO0+L0Undh0wt9IqIuGRSMR9iM/ibgfu4uLPobUQ2DMTeDuaNzTx2w8MiwYH1R4CsO80AigzzyIy/g0pUhkQPjivDKSk/2DB9AK/oFOZ8hgOupyB4r9nNXo1OCgik8Z987EutgDYR+L2lGWyWaJNWhPcZnR4T0OuENKi+iFFUNkav8mHqiqxGsP9N+90CC8wVGqqgQQAbF+l61gw+ouqSQ0+sHdC1DxWwOHSWZ0crx8atg+CMAI7XBPGmZPqyeRUnx0eLLHbQj6BESjAVt948/KKqomQVvLV8a/d4fW7ANvqCkfkKW2wtc9UXsRo4PRtkI61VeizJ42Ic8YvGsjU8KQ4xuSD7d2WPF8i9GB337eWNK+RspQFuL4Q7jptDyiuMI=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 72e4e354-690c-45fb-57fd-08dc872317da
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2024 18:53:17.4782
 (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: JWAqyV7sJesNhJ3cfhylTLCj6S3OjfWr7RAX2mujhppD52m8iEuXQCf7rbyeBAQIdDVGV0ckQerVAvKjf+hF31KCafg1yYroUStObMajZe4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16
 definitions=2024-06-07_11,2024-06-06_02,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 adultscore=0
 phishscore=0 suspectscore=0 bulkscore=0 spamscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2406070138
X-Proofpoint-GUID: mbuKiPBfaMo9MmfXx1yh6M2n3yqskt_u
X-Proofpoint-ORIG-GUID: mbuKiPBfaMo9MmfXx1yh6M2n3yqskt_u

Refactor mas_erase() to simply call mas_store_gfp() which will abstract
storing the null, memory allocation, and error handling.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 lib/maple_tree.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index b933df290887..bf309b7515e7 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -6355,7 +6355,6 @@ EXPORT_SYMBOL_GPL(mas_find_range_rev);
 void *mas_erase(struct ma_state *mas)
 {
 	void *entry;
-	MA_WR_STATE(wr_mas, mas, NULL);
 
 	if (!mas_is_active(mas) || !mas_is_start(mas))
 		mas->status = ma_start;
@@ -6365,15 +6364,9 @@ void *mas_erase(struct ma_state *mas)
 	if (!entry)
 		return NULL;
 
-write_retry:
 	/* Must reset to ensure spanning writes of last slot are detected */
 	mas_reset(mas);
-	mas_wr_store_setup(&wr_mas);
-	mas_wr_store_entry(&wr_mas);
-	if (mas_nomem(mas, GFP_KERNEL))
-		goto write_retry;
-
-	mas_destroy(mas);
+	mas_store_gfp(mas, NULL, GFP_KERNEL);
 	return entry;
 }
 EXPORT_SYMBOL_GPL(mas_erase);
-- 
2.45.2