zram: use __bio_add_page for adding single page to bio

[linux-block.git] / lib / maple_tree.c

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 1281a40d5735c423c47a451c53eec273dd8deda1..110a36479dced7f5e061d0562eb9e40bf89cdf15 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -2312,9 +2312,7 @@ static inline struct maple_enode *mte_node_or_none(struct maple_enode *enode)
 static inline void mas_wr_node_walk(struct ma_wr_state *wr_mas)
 {
        struct ma_state *mas = wr_mas->mas;
-       unsigned char count;
-       unsigned char offset;
-       unsigned long index, min, max;
+       unsigned char count, offset;
 
        if (unlikely(ma_is_dense(wr_mas->type))) {
                wr_mas->r_max = wr_mas->r_min = mas->index;
@@ -2327,34 +2325,12 @@ static inline void mas_wr_node_walk(struct ma_wr_state *wr_mas)
        count = wr_mas->node_end = ma_data_end(wr_mas->node, wr_mas->type,
                                               wr_mas->pivots, mas->max);
        offset = mas->offset;
-       min = mas_safe_min(mas, wr_mas->pivots, offset);
-       if (unlikely(offset == count))
-               goto max;
-
-       max = wr_mas->pivots[offset];
-       index = mas->index;
-       if (unlikely(index <= max))
-               goto done;
-
-       if (unlikely(!max && offset))
-               goto max;
-
-       min = max + 1;
-       while (++offset < count) {
-               max = wr_mas->pivots[offset];
-               if (index <= max)
-                       goto done;
-               else if (unlikely(!max))
-                       break;
 
-               min = max + 1;
-       }
+       while (offset < count && mas->index > wr_mas->pivots[offset])
+               offset++;
 
-max:
-       max = mas->max;
-done:
-       wr_mas->r_max = max;
-       wr_mas->r_min = min;
+       wr_mas->r_max = offset < count ? wr_mas->pivots[offset] : mas->max;
+       wr_mas->r_min = mas_safe_min(mas, wr_mas->pivots, offset);
        wr_mas->offset_end = mas->offset = offset;
 }
 
@@ -3282,7 +3258,7 @@ static inline void mas_destroy_rebalance(struct ma_state *mas, unsigned char end
 
                if (tmp < max_p)
                        memset(pivs + tmp, 0,
-                              sizeof(unsigned long *) * (max_p - tmp));
+                              sizeof(unsigned long) * (max_p - tmp));
 
                if (tmp < mt_slots[mt])
                        memset(slots + tmp, 0, sizeof(void *) * (max_s - tmp));
@@ -5274,25 +5250,28 @@ static inline void mas_fill_gap(struct ma_state *mas, void *entry,
  * @size: The size of the gap
  * @fwd: Searching forward or back
  */
-static inline void mas_sparse_area(struct ma_state *mas, unsigned long min,
+static inline int mas_sparse_area(struct ma_state *mas, unsigned long min,
                                unsigned long max, unsigned long size, bool fwd)
 {
-       unsigned long start = 0;
-
-       if (!unlikely(mas_is_none(mas)))
-               start++;
+       if (!unlikely(mas_is_none(mas)) && min == 0) {
+               min++;
+               /*
+                * At this time, min is increased, we need to recheck whether
+                * the size is satisfied.
+                */
+               if (min > max || max - min + 1 < size)
+                       return -EBUSY;
+       }
        /* mas_is_ptr */
 
-       if (start < min)
-               start = min;
-
        if (fwd) {
-               mas->index = start;
-               mas->last = start + size - 1;
-               return;
+               mas->index = min;
+               mas->last = min + size - 1;
+       } else {
+               mas->last = max;
+               mas->index = max - size + 1;
        }
-
-       mas->index = max;
+       return 0;
 }
 
 /*
@@ -5321,10 +5300,8 @@ int mas_empty_area(struct ma_state *mas, unsigned long min,
                return -EBUSY;
 
        /* Empty set */
-       if (mas_is_none(mas) || mas_is_ptr(mas)) {
-               mas_sparse_area(mas, min, max, size, true);
-               return 0;
-       }
+       if (mas_is_none(mas) || mas_is_ptr(mas))
+               return mas_sparse_area(mas, min, max, size, true);
 
        /* The start of the window can only be within these values */
        mas->index = min;
@@ -5380,10 +5357,8 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned long min,
        }
 
        /* Empty set. */
-       if (mas_is_none(mas) || mas_is_ptr(mas)) {
-               mas_sparse_area(mas, min, max, size, false);
-               return 0;
-       }
+       if (mas_is_none(mas) || mas_is_ptr(mas))
+               return mas_sparse_area(mas, min, max, size, false);
 
        /* The start of the window can only be within these values. */
        mas->index = min;
@@ -5815,6 +5790,7 @@ int mas_preallocate(struct ma_state *mas, gfp_t gfp)
        mas_reset(mas);
        return ret;
 }
+EXPORT_SYMBOL_GPL(mas_preallocate);
 
 /*
  * mas_destroy() - destroy a maple state.