diff options
| author | jpsollie <30946709+jpsollie@users.noreply.github.com> | 2021-02-16 13:59:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 13:59:58 +0100 |
| commit | 38a93ad6b29474e281b466b29c971420e796ba4f (patch) | |
| tree | 15271bc1a091670ba03a0f3bc7f842f93e17d57f /libbcachefs/btree_update_leaf.c | |
| parent | 3c7db5cec42cbf11d0a8f00b499e85ebeff8516a (diff) | |
| parent | a437f5fc84d4d1308771245f8a65035ac56630f6 (diff) | |
Merge pull request #16 from koverstreet/master
update
Diffstat (limited to 'libbcachefs/btree_update_leaf.c')
| -rw-r--r-- | libbcachefs/btree_update_leaf.c | 8 |
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); |