Merge pull request #196 from Conan-Kudo/spec-libexecdir

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

diff --git a/libbcachefs/darray.h b/libbcachefs/darray.h
index 87b4b2d1ec766f65e97c40cab918b256015ae3ed..e49be3ad858a9efd8c5683a23b65a328a6ea6bc3 100644 (file)
--- a/libbcachefs/darray.h
+++ b/libbcachefs/darray.h
@@ -8,7 +8,6 @@
  * Inspired by CCAN's darray
  */
 
-#include "util.h"
 #include <linux/slab.h>
 
 #define DARRAY(type)                                                   \
@@ -18,21 +17,27 @@ struct {                                                            \
 }
 
 typedef DARRAY(void) darray_void;
+typedef DARRAY(char *) darray_str;
 
-static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more, gfp_t gfp)
+int __bch2_darray_resize(darray_void *, size_t, size_t, gfp_t);
+
+static inline int __darray_resize(darray_void *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)                         \
+       __darray_resize((darray_void *) (_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_void *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)                          \
@@ -41,6 +46,8 @@ static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more,
 #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)                               \
@@ -72,11 +79,14 @@ static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more,
 #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 (_i = (_d).data + (_d).nr - 1; _i >= (_d).data; --_i)
+       for (typeof(&(_d).data[0]) _i = (_d).data + (_d).nr - 1; _i >= (_d).data; --_i)
 
 #define darray_init(_d)                                                        \
 do {                                                                   \
@@ -86,7 +96,7 @@ do {                                                                  \
 
 #define darray_exit(_d)                                                        \
 do {                                                                   \
-       kfree((_d)->data);                                              \
+       kvfree((_d)->data);                                             \
        darray_init(_d);                                                \
 } while (0)