The quilt patch titled
Subject: maple_tree: remove extra space and blank line
has been removed from the -mm tree. Its filename was
maple_tree-remove-extra-space-and-blank-line.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 <vernon2gm@xxxxxxxxx>
Subject: maple_tree: remove extra space and blank line
Date: Wed, 21 Dec 2022 14:00:52 +0800
Patch series "Clean up and refinement for maple tree", v2.
This patchset cleans up and refines some maple tree code. A few small
changes make the code easier to understand and for better readability.
This patch (of 7):
These extra space and blank lines are unnecessary, so drop them.
Link: https://lkml.kernel.org/r/20221221060058.609003-1-vernon2gm@xxxxxxxxx
Link: https://lkml.kernel.org/r/20221221060058.609003-2-vernon2gm@xxxxxxxxx
Signed-off-by: Vernon Yang <vernon2gm@xxxxxxxxx>
Reviewed-by: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/maple_tree.h | 2 --
lib/maple_tree.c | 14 ++++----------
2 files changed, 4 insertions(+), 12 deletions(-)
--- a/include/linux/maple_tree.h~maple_tree-remove-extra-space-and-blank-line
+++ a/include/linux/maple_tree.h
@@ -517,7 +517,6 @@ static inline void mas_reset(struct ma_s
* entry.
*
* Note: may return the zero entry.
- *
*/
#define mas_for_each(__mas, __entry, __max) \
while (((__entry) = mas_find((__mas), (__max))) != NULL)
@@ -639,7 +638,6 @@ static inline void mt_set_in_rcu(struct
}
static inline unsigned int mt_height(const struct maple_tree *mt)
-
{
return (mt->ma_flags & MT_FLAGS_HEIGHT_MASK) >> MT_FLAGS_HEIGHT_OFFSET;
}
--- a/lib/maple_tree.c~maple_tree-remove-extra-space-and-blank-line
+++ a/lib/maple_tree.c
@@ -183,7 +183,6 @@ static void ma_free_rcu(struct maple_nod
call_rcu(&node->rcu, mt_free_rcu);
}
-
static void mas_set_height(struct ma_state *mas)
{
unsigned int new_flags = mas->tree->ma_flags;
@@ -468,7 +467,7 @@ static inline
void mte_set_parent(struct maple_enode *enode, const struct maple_enode *parent,
unsigned char slot)
{
- unsigned long val = (unsigned long) parent;
+ unsigned long val = (unsigned long)parent;
unsigned long shift;
unsigned long type;
enum maple_type p_type = mte_node_type(parent);
@@ -502,7 +501,7 @@ void mte_set_parent(struct maple_enode *
*/
static inline unsigned int mte_parent_slot(const struct maple_enode *enode)
{
- unsigned long val = (unsigned long) mte_to_node(enode)->parent;
+ unsigned long val = (unsigned long)mte_to_node(enode)->parent;
/* Root. */
if (val & 1)
@@ -1278,7 +1277,6 @@ nomem_one:
mas->alloc->total = success;
mas_set_err(mas, -ENOMEM);
return;
-
}
/*
@@ -2946,7 +2944,7 @@ next:
mas->min = prev_min;
mas->max = prev_max;
mas->node = last;
- return (void *) next;
+ return (void *)next;
dead_node:
mas_reset(mas);
@@ -3466,7 +3464,6 @@ static inline bool mas_push_data(struct
*/
static int mas_split(struct ma_state *mas, struct maple_big_node *b_node)
{
-
struct maple_subtree_state mast;
int height = 0;
unsigned char mid_split, split = 0;
@@ -3892,7 +3889,7 @@ next:
goto dead_node;
} while (!ma_is_leaf(type));
- return (void *) next;
+ return (void *)next;
dead_node:
mas_reset(mas);
@@ -4710,7 +4707,6 @@ found:
static inline void mas_rewalk(struct ma_state *mas, unsigned long index)
{
-
retry:
mas_set(mas, index);
mas_state_walk(mas);
@@ -4718,7 +4714,6 @@ retry:
goto retry;
return;
-
}
/*
@@ -5620,7 +5615,6 @@ static void mas_wr_store_setup(struct ma
mas_reset(wr_mas->mas);
}
}
-
}
/* Interface */
_
Patches currently in -mm which might be from vernon2gm@xxxxxxxxx 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
