Skip to contentSkip to conversation

maple_tree-refine-ma_state-init-from-mas_start.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 19, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: maple_tree: refine ma_state init from mas_start()
has been removed from the -mm tree. Its filename was
maple_tree-refine-ma_state-init-from-mas_start.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Vernon Yang <[email protected]>
Subject: maple_tree: refine ma_state init from mas_start()
Date: Wed, 21 Dec 2022 14:00:57 +0800

If mas->node is an MAS_START, there are three cases, and they all assign different values to mas->node and mas->offset. So there is no need to set them to a default value before updating.

Update them directly to make them easier to understand and for better readability.

---

 lib/maple_tree.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-refine-ma_state-init-from-mas_start +3 -3
@@ -1329,7 +1329,7 @@ static void mas_node_count(struct ma_sta
  * mas_start() - Sets up maple state for operations.
  * @mas: The maple state.
  *
- * If mas->node == MAS_START, then set the min, max, depth, and offset to
+ * If mas->node == MAS_START, then set the min, max and depth to
  * defaults.
  *
  * Return:
@@ -1343,22 +1343,22 @@ static inline struct maple_enode *mas_st
 	if (likely(mas_is_start(mas))) {
 		struct maple_enode *root;
 
-		mas->node = MAS_NONE;
 		mas->min = 0;
 		mas->max = ULONG_MAX;
 		mas->depth = 0;
-		mas->offset = 0;
 
 		root = mas_root(mas);
 		/* Tree with nodes */
 		if (likely(xa_is_node(root))) {
 			mas->depth = 1;
 			mas->node = mte_safe_root(root);
+			mas->offset = 0;
 			return NULL;
 		}
 
 		/* empty tree */
 		if (unlikely(!root)) {
+			mas->node = MAS_NONE;
 			mas->offset = MAPLE_NODE_SLOTS;
 			return NULL;
 		}

_

Patches currently in -mm which might be from [email protected] are

maple_tree-remove-the-parameter-entry-of-mas_preallocate.patch mm-mmap-fix-typo-in-comment.patch maple_tree-fix-comment-of-mte_destroy_walk.patch mm-mmap-fix-comment-of-unmapped_area_topdown.patch