aboutsummaryrefslogtreecommitdiff
path: root/fs/bcachefs/data_update.c
diff options
context:
space:
mode:
authorGravatar Kent Overstreet <kent.overstreet@linux.dev> 2023-06-24 19:30:10 -0400
committerGravatar Kent Overstreet <kent.overstreet@linux.dev> 2023-10-22 17:10:04 -0400
commite53a961c6b1ced2ac1ab69fdf56706cf21e6f7a6 (patch)
treed819ad359a6011532bcdec8d8820797d829d3d04 /fs/bcachefs/data_update.c
parentbcachefs: BCH_ERR_fsck -> EINVAL (diff)
downloadlinux-e53a961c6b1ced2ac1ab69fdf56706cf21e6f7a6.tar.gz
linux-e53a961c6b1ced2ac1ab69fdf56706cf21e6f7a6.tar.bz2
linux-e53a961c6b1ced2ac1ab69fdf56706cf21e6f7a6.zip
bcachefs: Rename enum alloc_reserve -> bch_watermark
This is prep work for consolidating with JOURNAL_WATERMARK. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/data_update.c')
-rw-r--r--fs/bcachefs/data_update.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c
index 9f7a30c7ad36..cc79bcb6726c 100644
--- a/fs/bcachefs/data_update.c
+++ b/fs/bcachefs/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);
@@ -459,7 +459,7 @@ int bch2_data_update_init(struct btree_trans *trans,
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 = RESERVE_movinggc;
+ m->op.watermark = BCH_WATERMARK_copygc;
bkey_for_each_ptr(ptrs, ptr)
percpu_ref_get(&bch_dev_bkey_exists(c, ptr->dev)->ref);