From 1f79cf3825e94fcb146d417b6dda9b94c93c7a53 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 30 Dec 2023 22:54:04 -0500 Subject: Update bcachefs sources to 2a6125decb43 bcachefs: bch_sb_field_downgrade Signed-off-by: Kent Overstreet --- libbcachefs/darray.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libbcachefs/darray.c') diff --git a/libbcachefs/darray.c b/libbcachefs/darray.c index 4c900c85..ac35b8b7 100644 --- a/libbcachefs/darray.c +++ b/libbcachefs/darray.c @@ -4,7 +4,7 @@ #include #include "darray.h" -int __bch2_darray_resize(darray_void *d, size_t element_size, size_t new_size, gfp_t gfp) +int __bch2_darray_resize(darray_char *d, size_t element_size, size_t new_size, gfp_t gfp) { if (new_size > d->size) { new_size = roundup_pow_of_two(new_size); @@ -14,7 +14,8 @@ int __bch2_darray_resize(darray_void *d, size_t element_size, size_t new_size, g return -ENOMEM; memcpy(data, d->data, d->size * element_size); - kvfree(d->data); + if (d->data != d->preallocated) + kvfree(d->data); d->data = data; d->size = new_size; } -- cgit v1.2.3