mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
bcachefs: Fix rand_delete() test
When we didn't find a key to delete we were getting a null ptr deref. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com> Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
parent
a2bfc8412a
commit
d5b98fe2d7
1 changed files with 3 additions and 4 deletions
|
@ -563,15 +563,14 @@ static int __do_delete(struct btree_trans *trans, struct bpos pos)
|
||||||
|
|
||||||
iter = bch2_trans_get_iter(trans, BTREE_ID_XATTRS, pos,
|
iter = bch2_trans_get_iter(trans, BTREE_ID_XATTRS, pos,
|
||||||
BTREE_ITER_INTENT);
|
BTREE_ITER_INTENT);
|
||||||
ret = PTR_ERR_OR_ZERO(iter);
|
|
||||||
if (ret)
|
|
||||||
goto err;
|
|
||||||
|
|
||||||
k = bch2_btree_iter_peek(iter);
|
k = bch2_btree_iter_peek(iter);
|
||||||
ret = bkey_err(k);
|
ret = bkey_err(k);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
|
if (!k.k)
|
||||||
|
goto err;
|
||||||
|
|
||||||
bkey_init(&delete.k);
|
bkey_init(&delete.k);
|
||||||
delete.k.p = k.k->p;
|
delete.k.p = k.k->p;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue