diff options
Diffstat (limited to 'libbcachefs/btree_update_leaf.c')
| -rw-r--r-- | libbcachefs/btree_update_leaf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libbcachefs/btree_update_leaf.c b/libbcachefs/btree_update_leaf.c index 762a9773..c4054667 100644 --- a/libbcachefs/btree_update_leaf.c +++ b/libbcachefs/btree_update_leaf.c @@ -1160,13 +1160,13 @@ next: if (bch2_bkey_maybe_mergable(&insert->k, k.k)) { ret = check_pos_snapshot_overwritten(trans, btree_id, insert->k.p); if (ret < 0) - goto out; + goto err; if (ret) goto nomerge2; ret = check_pos_snapshot_overwritten(trans, btree_id, k.k->p); if (ret < 0) - goto out; + goto err; if (ret) goto nomerge2; @@ -1405,8 +1405,6 @@ retry: BTREE_INSERT_NOFAIL); if (ret) break; - - bch2_trans_cond_resched(trans); } if (ret == -EINTR) { |