diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-12-30 22:54:04 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-03 20:31:37 -0500 |
| commit | 1f79cf3825e94fcb146d417b6dda9b94c93c7a53 (patch) | |
| tree | 152d89dcb9217e1dbe18594d038a077e0d6f822c /libbcachefs/darray.h | |
| parent | 3054e5debba5ccf842346bd202921f08e43d1e84 (diff) | |
Update bcachefs sources to 2a6125decb43 bcachefs: bch_sb_field_downgrade
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/darray.h')
| -rw-r--r-- | libbcachefs/darray.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/libbcachefs/darray.h b/libbcachefs/darray.h index e49be3ad..d867ee62 100644 --- a/libbcachefs/darray.h +++ b/libbcachefs/darray.h @@ -10,18 +10,21 @@ #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; -typedef DARRAY(char *) darray_str; +#define DARRAY(_type) DARRAY_PREALLOCATED(_type, 0) -int __bch2_darray_resize(darray_void *, size_t, size_t, gfp_t); +typedef DARRAY(char) darray_char; +typedef DARRAY(char *) darray_str; -static inline int __darray_resize(darray_void *d, size_t element_size, +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) { return unlikely(new_size > d->size) @@ -30,18 +33,18 @@ static inline int __darray_resize(darray_void *d, size_t element_size, } #define darray_resize_gfp(_d, _new_size, _gfp) \ - __darray_resize((darray_void *) (_d), sizeof((_d)->data[0]), (_new_size), _gfp) + unlikely(__darray_resize((darray_char *) (_d), sizeof((_d)->data[0]), (_new_size), _gfp)) #define darray_resize(_d, _new_size) \ darray_resize_gfp(_d, _new_size, GFP_KERNEL) -static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more, gfp_t gfp) +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) @@ -90,13 +93,16 @@ 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)->nr = 0; \ + (_d)->size = ARRAY_SIZE((_d)->preallocated); \ + (_d)->data = (_d)->size ? (_d)->preallocated : NULL; \ } while (0) #define darray_exit(_d) \ do { \ - kvfree((_d)->data); \ + if (!ARRAY_SIZE((_d)->preallocated) || \ + (_d)->data != (_d)->preallocated) \ + kvfree((_d)->data); \ darray_init(_d); \ } while (0) |