diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-28 12:31:22 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-02 16:02:56 -0400 |
| commit | f62f16c9be960e274b4ebc965f7e2d00f9d6aea2 (patch) | |
| tree | 2afa3d2b1ecc41d08020ed789cd308a8d7732807 | |
| parent | e9083b26cc0705ac6dd8bde2d532011d886b1e31 (diff) | |
bcachefs: Heap code fix
When deleting an entry from a heap that was at entry h->used - 1, we'd
end up calling heap_sift() on an entry outside the heap - the entry we
just removed - which would end up re-adding it to the heap and deleting
something we didn't want to delete. Oops...
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/util.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h index aa56c94d6bd1..888693703c75 100644 --- a/fs/bcachefs/util.h +++ b/fs/bcachefs/util.h @@ -210,9 +210,11 @@ do { \ \ BUG_ON(_i >= (h)->used); \ (h)->used--; \ - heap_swap(h, _i, (h)->used, set_backpointer); \ - heap_sift_up(h, _i, cmp, set_backpointer); \ - heap_sift_down(h, _i, cmp, set_backpointer); \ + if ((_i) < (h)->used) { \ + heap_swap(h, _i, (h)->used, set_backpointer); \ + heap_sift_up(h, _i, cmp, set_backpointer); \ + heap_sift_down(h, _i, cmp, set_backpointer); \ + } \ } while (0) #define heap_pop(h, d, cmp, set_backpointer) \ |