Commit 73ab9e03 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Factor out darray resize slowpath 



Move the slowpath (actually growing the darray) to an out-of-line
function; also, add some helpers for the upcoming btree write buffer
rewrite.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent f87bf892

fs/bcachefs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ bcachefs-y := \ 
	clock.o			\

	compress.o		\

	counters.o		\

	darray.o		\

	debug.o			\

	dirent.o		\

	disk_groups.o		\

fs/bcachefs/darray.c

0 → 100644
+21 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <linux/log2.h>

#include <linux/slab.h>

#include "darray.h"



int __bch2_darray_resize(darray_void *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);



		void *data = krealloc_array(d->data, new_size, element_size, gfp);

		if (!data)

			return -ENOMEM;



		d->data	= data;

		d->size = new_size;

	}



	return 0;

}

fs/bcachefs/darray.h

+17 −11
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 * Inspired by CCAN's darray

 */



#include "util.h"

#include <linux/slab.h>



#define DARRAY(type)							\
@@ -19,20 +18,25 @@ struct { \ 


typedef DARRAY(void) darray_void;



static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more, gfp_t gfp)

int __bch2_darray_resize(darray_void *, size_t, size_t, gfp_t);



static inline int __darray_resize(darray_void *d, size_t element_size,

				  size_t new_size, 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);

	return unlikely(new_size > d->size)

		? __bch2_darray_resize(d, element_size, new_size, gfp)

		: 0;

}



		if (!data)

			return -ENOMEM;

#define darray_resize_gfp(_d, _new_size, _gfp)				\

	__darray_resize((darray_void *) (_d), sizeof((_d)->data[0]), (_new_size), _gfp)



		d->data	= data;

		d->size = new_size;

	}

#define darray_resize(_d, _new_size)					\

	darray_resize_gfp(_d, _new_size, GFP_KERNEL)



	return 0;

static inline int __darray_make_room(darray_void *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)				\
@@ -41,6 +45,8 @@ 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_gfp(_d, _more, GFP_KERNEL)



#define darray_room(_d)		((_d).size - (_d).nr)



#define darray_top(_d)		((_d).data[(_d).nr])



#define darray_push_gfp(_d, _item, _gfp)				\