diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-07-07 04:24:54 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-07-07 04:25:07 -0400 |
| commit | c99a444c5cc242a89845be83236aacd7db628ef5 (patch) | |
| tree | c4891accfde322013b94cc5dfd767184a1a8ccfb /libbcachefs/data_update.c | |
| parent | 619c99de4be8f0618e7c4cb65039de2aa1e2536c (diff) | |
Update bcachefs sources to 25de2b00dc bcachefs: Change check for invalid key types
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/data_update.c')
| -rw-r--r-- | libbcachefs/data_update.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libbcachefs/data_update.c b/libbcachefs/data_update.c index 053df0c6..3c918368 100644 --- 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); |