Update bcachefs sources to 070ec8d07b bcachefs: Snapshot depth, skiplist fields

[bcachefs-tools-debian] / libbcachefs / data_update.c

diff --git a/libbcachefs/data_update.c b/libbcachefs/data_update.c
index 053df0c67c48c16d5bb974cc0e28fe2af41dec2c..3c918368b2ecdf9f0c3f2b2474f4029b11b95fa0 100644 (file)
--- a/libbcachefs/data_update.c
+++ b/libbcachefs/data_update.c
@@ -381,7 +381,7 @@ void bch2_update_unwritten_extent(struct btree_trans *trans,
                                &update->op.devs_have,
                                update->op.nr_replicas,
                                update->op.nr_replicas,
-                               update->op.alloc_reserve,
+                               update->op.watermark,
                                0, &cl, &wp);
                if (bch2_err_matches(ret, BCH_ERR_operation_blocked)) {
                        bch2_trans_unlock(trans);
@@ -458,8 +458,7 @@ int bch2_data_update_init(struct btree_trans *trans,
        m->op.compression_type =
                bch2_compression_opt_to_type[io_opts.background_compression ?:
                                             io_opts.compression];
-       if (m->data_opts.btree_insert_flags & BTREE_INSERT_USE_RESERVE)
-               m->op.alloc_reserve = BCH_WATERMARK_copygc;
+       m->op.watermark         = m->data_opts.btree_insert_flags & BCH_WATERMARK_MASK;
 
        bkey_for_each_ptr(ptrs, ptr)
                percpu_ref_get(&bch_dev_bkey_exists(c, ptr->dev)->ref);