maple_tree: mas_store cleanup again..

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>

diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h
index 80e947d68e3ddf9d9051902610dca5e70a0fe63d..0374cd67ffcf2c10d00b9370a585b2123b53f6c0 100644 (file)
--- a/include/linux/maple_tree.h
+++ b/include/linux/maple_tree.h
@@ -321,6 +321,13 @@ struct ma_wr_state {
                .max = ULONG_MAX,                                       \
        }
 
+#define MA_WR_STATE(name, ma_state, wr_entry)                          \
+       struct ma_wr_state name = {                                     \
+               .mas = ma_state,                                        \
+               .content = NULL,                                        \
+               .entry = wr_entry,                                      \
+       }
+
 #define MA_TOPIARY(name, tree)                                         \
        struct ma_topiary name = {                                      \
                .head = NULL,                                           \

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 50e7c21db08c0b9897dbaa60d447b51ba0c10dfe..3278e955430a6a3b48cf50962a43b0153687b9c7 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -2178,13 +2178,12 @@ done:
  */
 static inline void mast_topiary(struct maple_subtree_state *mast)
 {
+       MA_WR_STATE(wr_mas, mast->orig_l, NULL);
        unsigned char l_off, r_off, offset;
        unsigned long l_index;
        struct maple_enode *child;
        void __rcu **slots;
-       struct ma_wr_state wr_mas;
 
-       wr_mas.mas = mast->orig_l;
        wr_mas.type = mte_node_type(mast->orig_l->node);
        /* The left node is consumed, so add to the free list. */
        l_index = mast->orig_l->index;
@@ -2341,9 +2340,9 @@ bool mast_cousin_rebalance_right(struct maple_subtree_state *mast, bool free)
 static inline void
 mast_ascend_free(struct maple_subtree_state *mast)
 {
+       MA_WR_STATE(wr_mas, mast->orig_r,  NULL);
        struct maple_enode *left = mast->orig_l->node;
        struct maple_enode *right = mast->orig_r->node;
-       struct ma_wr_state wr_mas;
 
        mas_ascend(mast->orig_l);
        mas_ascend(mast->orig_r);
@@ -2364,7 +2363,6 @@ mast_ascend_free(struct maple_subtree_state *mast)
        if (mast->orig_r->max < mast->orig_r->last)
                mast->orig_r->offset = mas_data_end(mast->orig_r) + 1;
        else {
-               wr_mas.mas = mast->orig_r;
                wr_mas.type = mte_node_type(mast->orig_r->node);
                mas_wr_node_walk(&wr_mas);
        }
@@ -3754,7 +3752,6 @@ done:
  */
 static inline int mas_spanning_store(struct ma_wr_state *wr_mas)
 {
-       struct ma_wr_state r_wr_mas, l_wr_mas;
        struct maple_subtree_state mast;
        struct maple_big_node b_node;
        struct ma_state *mas;
@@ -3764,6 +3761,9 @@ static inline int mas_spanning_store(struct ma_wr_state *wr_mas)
        MA_STATE(l_mas, NULL, 0, 0);
        MA_STATE(r_mas, NULL, 0, 0);
 
+       MA_WR_STATE(r_wr_mas, &r_mas, wr_mas->entry);
+       MA_WR_STATE(l_wr_mas, &l_mas, wr_mas->entry);
+
        mas = wr_mas->mas;
        trace_ma_op(__func__, mas);
 
@@ -3789,14 +3789,11 @@ static inline int mas_spanning_store(struct ma_wr_state *wr_mas)
                r_mas.last++;
 
        r_mas.index = r_mas.last;
-       r_wr_mas.mas = &r_mas;
        mas_wr_walk_index(&r_wr_mas);
        r_mas.last = r_mas.index = mas->last;
 
        /* Set up left side. */
        l_mas = *mas;
-       l_wr_mas.entry = wr_mas->entry;
-       l_wr_mas.mas = &l_mas;
        mas_wr_walk_index(&l_wr_mas);
 
        if (!wr_mas->entry) {
@@ -4317,7 +4314,7 @@ slow_path:
  */
 static inline void *mas_store_entry(struct ma_state *mas, void *entry)
 {
-       struct ma_wr_state wr_mas;
+       MA_WR_STATE(wr_mas, mas, entry);
 
        if ((wr_mas.content = mas_start(mas)) ||
            mas_is_none(mas) || mas->node == MAS_ROOT) {
@@ -4325,8 +4322,6 @@ static inline void *mas_store_entry(struct ma_state *mas, void *entry)
                return wr_mas.content;
        }
 
-       wr_mas.mas = mas;
-       wr_mas.entry = entry;
        if (!mas_wr_walk(&wr_mas)) {
                mas_spanning_store(&wr_mas);
                return wr_mas.content;
@@ -4360,7 +4355,7 @@ static inline void *mas_store_entry(struct ma_state *mas, void *entry)
  */
 static inline void *mas_insert(struct ma_state *mas, void *entry)
 {
-       struct ma_wr_state wr_mas;
+       MA_WR_STATE(wr_mas, mas, entry);
 
        wr_mas.content = mas_start(mas);
        if (wr_mas.content)
@@ -4371,8 +4366,6 @@ static inline void *mas_insert(struct ma_state *mas, void *entry)
                return NULL;
        }
 
-       wr_mas.mas = mas;
-       wr_mas.entry = entry;
        /* spanning writes always overwrite something */
        if (!mas_wr_walk(&wr_mas))
                goto exists;
@@ -5562,6 +5555,20 @@ static inline void mte_destroy_walk(struct maple_enode *enode,
                mt_destroy_walk(enode, mt->ma_flags, true);
        }
 }
+void mas_wr_store_setup(struct ma_wr_state *wr_mas)
+{
+       if (!mas_is_start(wr_mas->mas)) {
+               if (mas_is_none(wr_mas->mas))
+                       mas_reset(wr_mas->mas);
+               else {
+                       wr_mas->r_max = wr_mas->mas->max;
+                       wr_mas->type = mte_node_type(wr_mas->mas->node);
+                       if (mas_is_span_wr(wr_mas))
+                               mas_reset(wr_mas->mas);
+               }
+       }
+
+}
 
 /* Interface */
 
@@ -5576,8 +5583,7 @@ static inline void mte_destroy_walk(struct maple_enode *enode,
  */
 void *mas_store(struct ma_state *mas, void *entry)
 {
-       void *existing = NULL;
-       struct ma_wr_state wr_mas;
+       MA_WR_STATE(wr_mas, mas, entry);
 
        trace_ma_write(__func__, mas, 0, entry);
 #ifdef CONFIG_DEBUG_MAPLE_TREE
@@ -5590,24 +5596,10 @@ void *mas_store(struct ma_state *mas, void *entry)
        }
 
 #endif
-       wr_mas.mas = mas;
-       if ( !mas_is_start(mas)) {
-               if (mas_is_none(mas))
-                       mas_reset(mas);
-               else {
-                       wr_mas.r_max = mas->max;
-                       wr_mas.type = mte_node_type(mas->node);
-                       wr_mas.entry = entry;
-                       if (mas_is_span_wr(&wr_mas))
-                            mas_reset(mas);
-               }
-       }
 
-       existing = mas_store_entry(mas, entry);
-       if (unlikely(mas_is_err(mas)))
-               return existing;
-
-       return existing;
+       mas_wr_store_setup(&wr_mas);
+       wr_mas.content = mas_store_entry(mas, entry);
+       return wr_mas.content;
 }
 
 /*
@@ -5621,21 +5613,9 @@ void *mas_store(struct ma_state *mas, void *entry)
  */
 int mas_store_gfp(struct ma_state *mas, void *entry, gfp_t gfp)
 {
-       struct ma_wr_state wr_mas;
-
-       wr_mas.mas = mas;
-       if (!mas_is_start(mas)) {
-               if (mas_is_none(mas))
-                       mas_reset(mas);
-               else {
-                       wr_mas.r_max = mas->max;
-                       wr_mas.type = mte_node_type(mas->node);
-                       wr_mas.entry = entry;
-                       if (mas_is_span_wr(&wr_mas))
-                            mas_reset(mas);
-               }
-       }
+       MA_WR_STATE(wr_mas, mas, entry);
 
+       mas_wr_store_setup(&wr_mas);
        trace_ma_write(__func__, mas, 0, entry);
 retry:
        mas_store_entry(mas, entry);