Update bcachefs sources to 8e1519ccb6 bcachefs: Add tracepoint & counter for btree...

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

diff --git a/libbcachefs/darray.h b/libbcachefs/darray.h
index 745b1cdb0d1711ecff934d03e1274728ceeb8fa2..519ab9b96e67fd6e2257b3a63e3becde7711cbca 100644 (file)
--- a/libbcachefs/darray.h
+++ b/libbcachefs/darray.h
@@ -36,7 +36,7 @@ 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((darray_void *) &(_d), sizeof((_d).data[0]), (_more))
+       __darray_make_room((darray_void *) (_d), sizeof((_d)->data[0]), (_more))
 
 #define darray_top(_d)         ((_d).data[(_d).nr])
 
@@ -45,16 +45,17 @@ static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more)
        int _ret = darray_make_room((_d), 1);                           \
                                                                        \
        if (!_ret)                                                      \
-               (_d).data[(_d).nr++] = (_item);                         \
+               (_d)->data[(_d)->nr++] = (_item);                       \
        _ret;                                                           \
 })
 
 #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 +64,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)