Update bcachefs sources to 2a6125decb43 bcachefs: bch_sb_field_downgrade

[bcachefs-tools-debian] / libbcachefs / darray.h

diff --git a/libbcachefs/darray.h b/libbcachefs/darray.h
index d4485fa01b2aeec465a2f1a8bf94079aef16b3f6..d867ee620bc1f041e0a3c67fb8eba3ad28560285 100644 (file)
--- a/libbcachefs/darray.h
+++ b/libbcachefs/darray.h
@@ -8,39 +8,49 @@
  * Inspired by CCAN's darray
  */
 
-#include "util.h"
 #include <linux/slab.h>
 
-#define DARRAY(type)                                                   \
+#define DARRAY_PREALLOCATED(_type, _nr)                                        \
 struct {                                                               \
        size_t nr, size;                                                \
-       type *data;                                                     \
+       _type *data;                                                    \
+       _type preallocated[_nr];                                        \
 }
 
-typedef DARRAY(void) darray_void;
+#define DARRAY(_type) DARRAY_PREALLOCATED(_type, 0)
 
-static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more, gfp_t gfp)
+typedef DARRAY(char)   darray_char;
+typedef DARRAY(char *) darray_str;
+
+int __bch2_darray_resize(darray_char *, size_t, size_t, gfp_t);
+
+static inline int __darray_resize(darray_char *d, size_t element_size,
+                                 size_t new_size, gfp_t gfp)
 {
-       if (d->nr + more > d->size) {
-               size_t new_size = roundup_pow_of_two(d->nr + more);
-               void *data = krealloc_array(d->data, new_size, t_size, gfp);
+       return unlikely(new_size > d->size)
+               ? __bch2_darray_resize(d, element_size, new_size, gfp)
+               : 0;
+}
 
-               if (!data)
-                       return -ENOMEM;
+#define darray_resize_gfp(_d, _new_size, _gfp)                         \
+       unlikely(__darray_resize((darray_char *) (_d), sizeof((_d)->data[0]), (_new_size), _gfp))
 
-               d->data = data;
-               d->size = new_size;
-       }
+#define darray_resize(_d, _new_size)                                   \
+       darray_resize_gfp(_d, _new_size, GFP_KERNEL)
 
-       return 0;
+static inline int __darray_make_room(darray_char *d, size_t t_size, size_t more, gfp_t gfp)
+{
+       return __darray_resize(d, t_size, d->nr + more, gfp);
 }
 
 #define darray_make_room_gfp(_d, _more, _gfp)                          \
-       __darray_make_room((darray_void *) (_d), sizeof((_d)->data[0]), (_more), _gfp)
+       __darray_make_room((darray_char *) (_d), sizeof((_d)->data[0]), (_more), _gfp)
 
 #define darray_make_room(_d, _more)                                    \
        darray_make_room_gfp(_d, _more, GFP_KERNEL)
 
+#define darray_room(_d)                ((_d).size - (_d).nr)
+
 #define darray_top(_d)         ((_d).data[(_d).nr])
 
 #define darray_push_gfp(_d, _item, _gfp)                               \
@@ -59,28 +69,40 @@ static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more,
 #define darray_first(_d)       ((_d).data[0])
 #define darray_last(_d)                ((_d).data[(_d).nr - 1])
 
-#define darray_insert_item(_d, _pos, _item)                            \
+#define darray_insert_item(_d, pos, _item)                             \
 ({                                                                     \
-       size_t pos = (_pos);                                            \
+       size_t _pos = (pos);                                            \
        int _ret = darray_make_room((_d), 1);                           \
                                                                        \
        if (!_ret)                                                      \
-               array_insert_item((_d)->data, (_d)->nr, pos, (_item));  \
+               array_insert_item((_d)->data, (_d)->nr, _pos, (_item)); \
        _ret;                                                           \
 })
 
+#define darray_remove_item(_d, _pos)                                   \
+       array_remove_item((_d)->data, (_d)->nr, (_pos) - (_d)->data)
+
+#define __darray_for_each(_d, _i)                                              \
+       for ((_i) = (_d).data; _i < (_d).data + (_d).nr; _i++)
+
 #define darray_for_each(_d, _i)                                                \
-       for (_i = (_d).data; _i < (_d).data + (_d).nr; _i++)
+       for (typeof(&(_d).data[0]) _i = (_d).data; _i < (_d).data + (_d).nr; _i++)
+
+#define darray_for_each_reverse(_d, _i)                                        \
+       for (typeof(&(_d).data[0]) _i = (_d).data + (_d).nr - 1; _i >= (_d).data; --_i)
 
 #define darray_init(_d)                                                        \
 do {                                                                   \
-       (_d)->data = NULL;                                              \
-       (_d)->nr = (_d)->size = 0;                                      \
+       (_d)->nr = 0;                                                   \
+       (_d)->size = ARRAY_SIZE((_d)->preallocated);                    \
+       (_d)->data = (_d)->size ? (_d)->preallocated : NULL;            \
 } while (0)
 
 #define darray_exit(_d)                                                        \
 do {                                                                   \
-       kfree((_d)->data);                                              \
+       if (!ARRAY_SIZE((_d)->preallocated) ||                          \
+           (_d)->data != (_d)->preallocated)                           \
+               kvfree((_d)->data);                                     \
        darray_init(_d);                                                \
 } while (0)