diff options
| -rw-r--r-- | fs/bcachefs/darray.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/darray.h | 25 |
2 files changed, 10 insertions, 17 deletions
diff --git a/fs/bcachefs/darray.c b/fs/bcachefs/darray.c index ac35b8b705ae..94d0611d4a32 100644 --- a/fs/bcachefs/darray.c +++ b/fs/bcachefs/darray.c @@ -9,7 +9,7 @@ int __bch2_darray_resize(darray_char *d, size_t element_size, size_t new_size, g if (new_size > d->size) { new_size = roundup_pow_of_two(new_size); - void *data = kvmalloc_array(new_size, element_size, gfp); + void *data = kvmalloc_array_noprof(new_size, element_size, gfp); if (!data) return -ENOMEM; diff --git a/fs/bcachefs/darray.h b/fs/bcachefs/darray.h index 4b340d13caac..e8be2f981800 100644 --- a/fs/bcachefs/darray.h +++ b/fs/bcachefs/darray.h @@ -24,27 +24,20 @@ 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) -{ - return unlikely(new_size > d->size) - ? __bch2_darray_resize(d, element_size, new_size, gfp) - : 0; -} +#define __darray_resize_gfp(_d, _element_size, _new_size, _gfp) \ + alloc_hooks(__bch2_darray_resize((_d), _element_size, (_new_size), _gfp)) -#define darray_resize_gfp(_d, _new_size, _gfp) \ - unlikely(__darray_resize((darray_char *) (_d), sizeof((_d)->data[0]), (_new_size), _gfp)) +#define darray_resize_gfp(_d, _new_size, _gfp) \ + (unlikely(_new_size > (_d)->size) \ + ? __darray_resize_gfp((darray_char *) (_d), sizeof((_d)->data[0]), \ + (_new_size), _gfp) \ + : 0) -#define darray_resize(_d, _new_size) \ +#define darray_resize(_d, _new_size) \ darray_resize_gfp(_d, _new_size, GFP_KERNEL) -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_char *) (_d), sizeof((_d)->data[0]), (_more), _gfp) + darray_resize_gfp(_d, (_d)->nr + (_more), _gfp) #define darray_make_room(_d, _more) \ darray_make_room_gfp(_d, _more, GFP_KERNEL) |