maple_tree: convert mas_insert() to preallocate nodes

By setting the store type in mas_insert(), we no longer need to use
mas_wr_modify() to determine the correct store function to use. Instead,
set the store type and call mas_wr_store_entry(). Also, pass in the
requested gfp flags to mas_insert() so they can be passed to the call to
mas_wr_preallocate().

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 59fa7daf5b3918292aa58beb5a1529b6483f9d5f..9770c53a87a49cd95304bf59995da928cbf3e218 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -4447,7 +4447,7 @@ static inline void mas_wr_preallocate(struct ma_wr_state *wr_mas, void *entry, g
  * Return: %NULL or the contents that already exists at the requested index
  * otherwise.  The maple state needs to be checked for error conditions.
  */
-static inline void *mas_insert(struct ma_state *mas, void *entry)
+static inline void *mas_insert(struct ma_state *mas, void *entry, gfp_t gfp)
 {
        MA_WR_STATE(wr_mas, mas, entry);
 
@@ -4469,26 +4469,24 @@ static inline void *mas_insert(struct ma_state *mas, void *entry)
        if (wr_mas.content)
                goto exists;
 
-       if (mas_is_none(mas) || mas_is_ptr(mas)) {
-               mas_store_root(mas, entry);
+       mas_wr_preallocate(&wr_mas, entry, gfp);
+       if (mas_is_err(mas))
                return NULL;
-       }
 
        /* spanning writes always overwrite something */
-       if (!mas_wr_walk(&wr_mas))
+       if (mas->store_type == wr_spanning_store)
                goto exists;
 
        /* At this point, we are at the leaf node that needs to be altered. */
-       wr_mas.offset_end = mas->offset;
-       wr_mas.end_piv = wr_mas.r_max;
-
-       if (wr_mas.content || (mas->last > wr_mas.r_max))
-               goto exists;
+       if (mas->store_type != wr_new_root && mas->store_type != wr_store_root) {
+               wr_mas.offset_end = mas->offset;
+               wr_mas.end_piv = wr_mas.r_max;
 
-       if (!entry)
-               return NULL;
+               if (wr_mas.content || (mas->last > wr_mas.r_max))
+                       goto exists;
+       }
 
-       mas_wr_modify(&wr_mas);
+       mas_wr_store_entry(&wr_mas);
        return wr_mas.content;
 
 exists:
@@ -6483,7 +6481,7 @@ int mtree_insert_range(struct maple_tree *mt, unsigned long first,
 
        mtree_lock(mt);
 retry:
-       mas_insert(&ms, entry);
+       mas_insert(&ms, entry, gfp);
        if (mas_nomem(&ms, gfp))
                goto retry;
 
@@ -6532,7 +6530,7 @@ retry:
        if (ret)
                goto unlock;
 
-       mas_insert(&mas, entry);
+       mas_insert(&mas, entry, gfp);
        /*
         * mas_nomem() may release the lock, causing the allocated area
         * to be unavailable, so try to allocate a free area again.
@@ -6571,7 +6569,7 @@ retry:
        if (ret)
                goto unlock;
 
-       mas_insert(&mas, entry);
+       mas_insert(&mas, entry, gfp);
        /*
         * mas_nomem() may release the lock, causing the allocated area
         * to be unavailable, so try to allocate a free area again.