Update bcachefs sources to 400f275d46 bcachefs: Fix check_overlapping_extents()

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

diff --git a/libbcachefs/darray.h b/libbcachefs/darray.h
index 745b1cdb0d1711ecff934d03e1274728ceeb8fa2..d4485fa01b2aeec465a2f1a8bf94079aef16b3f6 100644 (file)
--- a/libbcachefs/darray.h
+++ b/libbcachefs/darray.h
@@ -19,11 +19,11 @@ struct {                                                            \
 
 typedef DARRAY(void) darray_void;
 
-static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more)
+static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more, 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_KERNEL);
+               void *data = krealloc_array(d->data, new_size, t_size, gfp);
 
                if (!data)
                        return -ENOMEM;
@@ -35,26 +35,37 @@ static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more)
        return 0;
 }
 
+#define darray_make_room_gfp(_d, _more, _gfp)                          \
+       __darray_make_room((darray_void *) (_d), sizeof((_d)->data[0]), (_more), _gfp)
+
 #define darray_make_room(_d, _more)                                    \
-       __darray_make_room((darray_void *) &(_d), sizeof((_d).data[0]), (_more))
+       darray_make_room_gfp(_d, _more, GFP_KERNEL)
 
 #define darray_top(_d)         ((_d).data[(_d).nr])
 
-#define darray_push(_d, _item)                                         \
+#define darray_push_gfp(_d, _item, _gfp)                               \
 ({                                                                     \
-       int _ret = darray_make_room((_d), 1);                           \
+       int _ret = darray_make_room_gfp((_d), 1, _gfp);                 \
                                                                        \
        if (!_ret)                                                      \
-               (_d).data[(_d).nr++] = (_item);                         \
+               (_d)->data[(_d)->nr++] = (_item);                       \
        _ret;                                                           \
 })
 
+#define darray_push(_d, _item) darray_push_gfp(_d, _item, GFP_KERNEL)
+
+#define darray_pop(_d)         ((_d)->data[--(_d)->nr])
+
+#define darray_first(_d)       ((_d).data[0])
+#define darray_last(_d)                ((_d).data[(_d).nr - 1])
+
 #define darray_insert_item(_d, _pos, _item)                            \
 ({                                                                     \
+       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;                                                           \
 })
 
@@ -63,13 +74,13 @@ static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more)
 
 #define darray_init(_d)                                                        \
 do {                                                                   \
-       (_d).data = NULL;                                               \
-       (_d).nr = (_d).size = 0;                                        \
+       (_d)->data = NULL;                                              \
+       (_d)->nr = (_d)->size = 0;                                      \
 } while (0)
 
 #define darray_exit(_d)                                                        \
 do {                                                                   \
-       kfree((_d).data);                                               \
+       kfree((_d)->data);                                              \
        darray_init(_d);                                                \
 } while (0)