Commit f83009cd authored by Kent Overstreet's avatar Kent Overstreet

bcachefs: Don't issue transaction restart on key cache realloc

This shouldn't be needed anymore, since we don't rely on the pointer
validity that this was guarding against anymore - we get a new good
reference and save it right after this function.
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent ef035f42
...@@ -339,7 +339,7 @@ btree_key_can_insert_cached(struct btree_trans *trans, ...@@ -339,7 +339,7 @@ btree_key_can_insert_cached(struct btree_trans *trans,
{ {
struct bch_fs *c = trans->c; struct bch_fs *c = trans->c;
struct bkey_cached *ck = (void *) path->l[0].b; struct bkey_cached *ck = (void *) path->l[0].b;
unsigned old_u64s = ck->u64s, new_u64s; unsigned new_u64s;
struct bkey_i *new_k; struct bkey_i *new_k;
EBUG_ON(path->level); EBUG_ON(path->level);
...@@ -368,12 +368,7 @@ btree_key_can_insert_cached(struct btree_trans *trans, ...@@ -368,12 +368,7 @@ btree_key_can_insert_cached(struct btree_trans *trans,
ck->u64s = new_u64s; ck->u64s = new_u64s;
ck->k = new_k; ck->k = new_k;
/* return 0;
* Keys returned by peek() are no longer valid pointers, so we need a
* transaction restart:
*/
trace_and_count(c, trans_restart_key_cache_key_realloced, trans, _RET_IP_, path, old_u64s, new_u64s);
return btree_trans_restart_nounlock(trans, BCH_ERR_transaction_restart_key_cache_realloced);
} }
/* Triggers: */ /* Triggers: */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment