diff options
Diffstat (limited to 'libbcachefs/replicas.c')
| -rw-r--r-- | libbcachefs/replicas.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/libbcachefs/replicas.c b/libbcachefs/replicas.c index 678b9c20..cc2672c1 100644 --- a/libbcachefs/replicas.c +++ b/libbcachefs/replicas.c @@ -6,15 +6,12 @@ #include "replicas.h" #include "super-io.h" -#include <linux/sort.h> - static int bch2_cpu_replicas_to_sb_replicas(struct bch_fs *, struct bch_replicas_cpu *); /* Some (buggy!) compilers don't allow memcmp to be passed as a pointer */ -static int bch2_memcmp(const void *l, const void *r, const void *priv) +static int bch2_memcmp(const void *l, const void *r, size_t size) { - size_t size = (size_t) priv; return memcmp(l, r, size); } @@ -42,8 +39,7 @@ void bch2_replicas_entry_sort(struct bch_replicas_entry_v1 *e) static void bch2_cpu_replicas_sort(struct bch_replicas_cpu *r) { - eytzinger0_sort_r(r->entries, r->nr, r->entry_size, - bch2_memcmp, NULL, (void *)(size_t)r->entry_size); + eytzinger0_sort(r->entries, r->nr, r->entry_size, bch2_memcmp, NULL); } static void bch2_replicas_entry_v0_to_text(struct printbuf *out, @@ -232,7 +228,7 @@ static inline int __replicas_entry_idx(struct bch_replicas_cpu *r, verify_replicas_entry(search); -#define entry_cmp(_l, _r) memcmp(_l, _r, entry_size) +#define entry_cmp(_l, _r, size) memcmp(_l, _r, entry_size) idx = eytzinger0_find(r->entries, r->nr, r->entry_size, entry_cmp, search); #undef entry_cmp @@ -828,11 +824,10 @@ static int bch2_cpu_replicas_validate(struct bch_replicas_cpu *cpu_r, { unsigned i; - sort_r(cpu_r->entries, - cpu_r->nr, - cpu_r->entry_size, - bch2_memcmp, NULL, - (void *)(size_t)cpu_r->entry_size); + sort_cmp_size(cpu_r->entries, + cpu_r->nr, + cpu_r->entry_size, + bch2_memcmp, NULL); for (i = 0; i < cpu_r->nr; i++) { struct bch_replicas_entry_v1 *e = |