]> git.sesse.net Git - bcachefs-tools-debian/commitdiff
Fixup from darray change
authorKent Overstreet <kent.overstreet@gmail.com>
Mon, 27 Jun 2022 18:45:48 +0000 (14:45 -0400)
committerKent Overstreet <kent.overstreet@gmail.com>
Mon, 27 Jun 2022 19:58:34 +0000 (15:58 -0400)
This fixes cmd_migrate

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
tools-util.h

index e9f0ce94ab0e2978afd5eff7989b1ba5828010cb..d1122f5d1556d34970d5704c06dedb8eb832b583 100644 (file)
@@ -95,7 +95,7 @@ static inline struct range hole_iter_next(struct hole_iter *iter)
 {
        struct range r = {
                .start  = iter->idx ? iter->r.data[iter->idx - 1].end : 0,
-               .end    = iter->idx < iter->r.size
+               .end    = iter->idx < iter->r.nr
                        ? iter->r.data[iter->idx].start : iter->end,
        };
 
@@ -107,7 +107,7 @@ static inline struct range hole_iter_next(struct hole_iter *iter)
 
 #define for_each_hole(_iter, _ranges, _end, _i)                                \
        for (_iter = (struct hole_iter) { .r = _ranges, .end = _end };  \
-            (_iter.idx <= _iter.r.size &&                              \
+            (_iter.idx <= _iter.r.nr &&                                \
              (_i = hole_iter_next(&_iter), true));)
 
 #include <linux/fiemap.h>