summaryrefslogtreecommitdiff
path: root/libbcachefs/btree_update_leaf.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-02-12 16:02:38 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2021-02-12 16:02:52 -0500
commit868abec1ab5068dcab59fb8d7ad5e11b7bba89f3 (patch)
tree582d3cbf397a7023df9dfeca5f28dc8360c9d579 /libbcachefs/btree_update_leaf.c
parent612f6b9ab73c7f46e0254355b707d494a8ad9270 (diff)
Update bcachefs sources to 5e73602f6c bcachefs: Fix for fsck hanging
Diffstat (limited to 'libbcachefs/btree_update_leaf.c')
-rw-r--r--libbcachefs/btree_update_leaf.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/libbcachefs/btree_update_leaf.c b/libbcachefs/btree_update_leaf.c
index 967e1e4d..d09124fc 100644
--- a/libbcachefs/btree_update_leaf.c
+++ b/libbcachefs/btree_update_leaf.c
@@ -951,12 +951,8 @@ retry:
trans_for_each_iter(trans, iter)
if ((trans->iters_live & (1ULL << iter->idx)) &&
- (iter->flags & BTREE_ITER_SET_POS_AFTER_COMMIT)) {
- if (trans->flags & BTREE_INSERT_NOUNLOCK)
- bch2_btree_iter_set_pos_same_leaf(iter, iter->pos_after_commit);
- else
- bch2_btree_iter_set_pos(iter, iter->pos_after_commit);
- }
+ (iter->flags & BTREE_ITER_SET_POS_AFTER_COMMIT))
+ bch2_btree_iter_set_pos(iter, iter->pos_after_commit);
out:
bch2_journal_preres_put(&trans->c->journal, &trans->journal_preres);