diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-03 20:11:29 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-03 20:19:25 -0400 |
| commit | 2ab2ab0f781ae750473763e8a042c900a982d399 (patch) | |
| tree | 2d76ee40a4cf6b6a54c180a9100216cc45c26f91 /libbcachefs/movinggc.c | |
| parent | e288c9f1de8a1b21a77cbfb80dfec37f2515e33c (diff) | |
Update bcachefs sources to b12d1535f3 bcachefs: fix bounds checks in bch2_bio_map()
Diffstat (limited to 'libbcachefs/movinggc.c')
| -rw-r--r-- | libbcachefs/movinggc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbcachefs/movinggc.c b/libbcachefs/movinggc.c index 46886562..70318f2c 100644 --- a/libbcachefs/movinggc.c +++ b/libbcachefs/movinggc.c @@ -160,7 +160,7 @@ static void bch2_copygc(struct bch_fs *c, struct bch_dev *ca) .sectors = bucket_sectors_used(m), .offset = bucket_to_sector(ca, b), }; - heap_add_or_replace(h, e, -sectors_used_cmp); + heap_add_or_replace(h, e, -sectors_used_cmp, NULL); } up_read(&ca->bucket_lock); up_read(&c->gc_lock); @@ -169,7 +169,7 @@ static void bch2_copygc(struct bch_fs *c, struct bch_dev *ca) sectors_to_move += i->sectors; while (sectors_to_move > COPYGC_SECTORS_PER_ITER(ca)) { - BUG_ON(!heap_pop(h, e, -sectors_used_cmp)); + BUG_ON(!heap_pop(h, e, -sectors_used_cmp, NULL)); sectors_to_move -= e.sectors; } |