From e240b4ae86adb022e3266220ce9807dad8b51beb Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 30 Mar 2022 17:40:25 -0400 Subject: Update bcachefs sources to f638850417 bcachefs: bch2_trans_log_msg() --- tools-util.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tools-util.h') diff --git a/tools-util.h b/tools-util.h index 78827b84..a0e20ebf 100644 --- a/tools-util.h +++ b/tools-util.h @@ -18,7 +18,7 @@ #include #include #include -#include "ccan/darray/darray.h" +#include "libbcachefs/darray.h" #define noreturn __attribute__((noreturn)) @@ -72,14 +72,14 @@ struct range { u64 end; }; -typedef darray(struct range) ranges; +typedef DARRAY(struct range) ranges; static inline void range_add(ranges *data, u64 offset, u64 size) { - darray_append(*data, (struct range) { + darray_push(*data, ((struct range) { .start = offset, .end = offset + size - }); + })); } void ranges_sort_merge(ranges *); @@ -95,9 +95,9 @@ struct hole_iter { static inline struct range hole_iter_next(struct hole_iter *iter) { struct range r = { - .start = iter->idx ? iter->r.item[iter->idx - 1].end : 0, + .start = iter->idx ? iter->r.data[iter->idx - 1].end : 0, .end = iter->idx < iter->r.size - ? iter->r.item[iter->idx].start : iter->end, + ? iter->r.data[iter->idx].start : iter->end, }; BUG_ON(r.start > r.end); -- cgit v1.2.3