diff options
author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-05-17 16:47:05 -0400 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-05-17 16:48:48 -0400 |
commit | 2e2d5a3f7ed4f6d4e2a45011a82386ba82cd3976 (patch) | |
tree | 533b857dfd5b734ae1a8f6e61202c2b55153f5b2 /libbcachefs/reflink.c | |
parent | 8f72e6940c0bdf5cc1f1e0faf13b9e7a781161c6 (diff) |
Update bcachefs sources to 0cd3e1d27a bcachefs: Fix for bch2_bkey_pack_pos() not initializing len/version fields
Diffstat (limited to 'libbcachefs/reflink.c')
-rw-r--r-- | libbcachefs/reflink.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libbcachefs/reflink.c b/libbcachefs/reflink.c index 0978ad92..405a194d 100644 --- a/libbcachefs/reflink.c +++ b/libbcachefs/reflink.c @@ -2,6 +2,7 @@ #include "bcachefs.h" #include "bkey_buf.h" #include "btree_update.h" +#include "buckets.h" #include "extents.h" #include "inode.h" #include "io.h" @@ -224,6 +225,8 @@ s64 bch2_remap_range(struct bch_fs *c, BTREE_ITER_INTENT); while (ret == 0 || ret == -EINTR) { + struct disk_reservation disk_res = { 0 }; + bch2_trans_begin(&trans); if (fatal_signal_pending(current)) { @@ -287,8 +290,9 @@ s64 bch2_remap_range(struct bch_fs *c, dst_end.offset - dst_iter->pos.offset)); ret = bch2_extent_update(&trans, dst_iter, new_dst.k, - NULL, journal_seq, + &disk_res, journal_seq, new_i_size, i_sectors_delta); + bch2_disk_reservation_put(c, &disk_res); if (ret) continue; |