diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-01-20 19:42:09 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-04-27 12:22:42 -0400 |
| commit | 2fd17d8c82954c714122cd3a9e5a9f82e2969e61 (patch) | |
| tree | 20e696138c873463298b11fc64e4723da0f62f20 /fs | |
| parent | 6604c45668f917f48a95ef8a85eeb2714e310f2c (diff) | |
bcachefs: Clean up bch2_extent_can_insert
It was using an internal btree node iterator interface, when
bch2_btree_iter_peek_slot() sufficed. We were hitting a null ptr deref
that looked like it was from the iterator not being uptodate - this will
also fix that.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bcachefs/extent_update.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/fs/bcachefs/extent_update.c b/fs/bcachefs/extent_update.c index 1faca4bc1825..5c43678e94a3 100644 --- a/fs/bcachefs/extent_update.c +++ b/fs/bcachefs/extent_update.c @@ -192,18 +192,13 @@ bch2_extent_can_insert(struct btree_trans *trans, struct btree_iter *iter, struct bkey_i *insert) { - struct btree_iter_level *l = &iter->l[0]; - struct btree_node_iter node_iter = l->iter; - struct bkey_packed *_k; struct bkey_s_c k; - struct bkey unpacked; - int sectors; + int ret, sectors; - _k = bch2_btree_node_iter_peek(&node_iter, l->b); - if (!_k) - return BTREE_INSERT_OK; - - k = bkey_disassemble(l->b, _k, &unpacked); + k = bch2_btree_iter_peek_slot(iter); + ret = bkey_err(k); + if (ret) + return ret; /* Check if we're splitting a compressed extent: */ |