Skip to content

Commit 94bdeec

Browse files
author
Kent Overstreet
committed
bcachefs: fix bch2_hash_delete() error path
we were exiting an iterator that hadn't been initialized Signed-off-by: Kent Overstreet <[email protected]>
1 parent 74ec2f3 commit 94bdeec

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

fs/bcachefs/str_hash.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,11 @@ int bch2_hash_delete(struct btree_trans *trans,
363363
struct btree_iter iter;
364364
struct bkey_s_c k = bch2_hash_lookup(trans, &iter, desc, info, inum, key,
365365
BTREE_ITER_intent);
366-
int ret = bkey_err(k) ?:
367-
bch2_hash_delete_at(trans, desc, info, &iter, 0);
366+
int ret = bkey_err(k);
367+
if (ret)
368+
return ret;
369+
370+
ret = bch2_hash_delete_at(trans, desc, info, &iter, 0);
368371
bch2_trans_iter_exit(trans, &iter);
369372
return ret;
370373
}

0 commit comments

Comments
 (0)