diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-12-28 18:19:05 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-12-28 18:20:16 -0500 |
| commit | 82c7e8ff35ac0c501290cd4779e8ab2c553aa09d (patch) | |
| tree | 821332b992d3946069e7dd4495a853a88c415e75 /libbcachefs/reflink.c | |
| parent | 956a05a126cebb085178cea318543369926362b2 (diff) | |
Update bcachefs sources to cfb41d25c7 bcachefs: Add an assertion to track down a heisenbug
Diffstat (limited to 'libbcachefs/reflink.c')
| -rw-r--r-- | libbcachefs/reflink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/reflink.c b/libbcachefs/reflink.c index 53bd0e0e..5cad39fe 100644 --- a/libbcachefs/reflink.c +++ b/libbcachefs/reflink.c @@ -185,7 +185,8 @@ s64 bch2_remap_range(struct bch_fs *c, BTREE_ITER_INTENT); while (1) { - bch2_trans_begin_updates(&trans); + bch2_trans_reset(&trans, TRANS_RESET_MEM); + trans.mem_top = 0; if (fatal_signal_pending(current)) { @@ -287,8 +288,7 @@ err: inode_u.bi_size < new_i_size) { inode_u.bi_size = new_i_size; ret2 = bch2_inode_write(&trans, inode_iter, &inode_u) ?: - bch2_trans_commit(&trans, NULL, journal_seq, - BTREE_INSERT_ATOMIC); + bch2_trans_commit(&trans, NULL, journal_seq, 0); } } while (ret2 == -EINTR); |