diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-12-17 15:42:17 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-12-18 23:21:21 -0500 |
| commit | f76d246fff1c3c5b091fb2b910067d893620dc5e (patch) | |
| tree | ccc6d2f9b90399ec4758a363d3bcce7f0e002d3e /tools-util.c | |
| parent | b7453196fe82ee70a3ec657847e974450fdac8ad (diff) | |
Update bcachefs sources to 1a739db0b256 bcachefs; guard against overflow in btree node split
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'tools-util.c')
| -rw-r--r-- | tools-util.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools-util.c b/tools-util.c index a1e67dd5..5b0c1bf5 100644 --- a/tools-util.c +++ b/tools-util.c @@ -293,14 +293,13 @@ static int range_cmp(const void *_l, const void *_r) void ranges_sort_merge(ranges *r) { - struct range *t, *i; ranges tmp = { 0 }; sort(r->data, r->nr, sizeof(r->data[0]), range_cmp, NULL); /* Merge contiguous ranges: */ darray_for_each(*r, i) { - t = tmp.nr ? &tmp.data[tmp.nr - 1] : NULL; + struct range *t = tmp.nr ? &tmp.data[tmp.nr - 1] : NULL; if (t && t->end >= i->start) t->end = max(t->end, i->end); @@ -314,8 +313,6 @@ void ranges_sort_merge(ranges *r) void ranges_roundup(ranges *r, unsigned block_size) { - struct range *i; - darray_for_each(*r, i) { i->start = round_down(i->start, block_size); i->end = round_up(i->end, block_size); @@ -324,8 +321,6 @@ void ranges_roundup(ranges *r, unsigned block_size) void ranges_rounddown(ranges *r, unsigned block_size) { - struct range *i; - darray_for_each(*r, i) { i->start = round_up(i->start, block_size); i->end = round_down(i->end, block_size); |