summaryrefslogtreecommitdiff
path: root/libbcachefs/data_update.c
diff options
context:
space:
mode:
Diffstat (limited to 'libbcachefs/data_update.c')
-rw-r--r--libbcachefs/data_update.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/libbcachefs/data_update.c b/libbcachefs/data_update.c
index e414d1af..de808fcc 100644
--- a/libbcachefs/data_update.c
+++ b/libbcachefs/data_update.c
@@ -163,7 +163,11 @@ static int __bch2_data_update_index_update(struct btree_trans *trans,
if (((1U << i) & m->data_opts.rewrite_ptrs) &&
(ptr = bch2_extent_has_ptr(old, p, bkey_i_to_s(insert))) &&
!ptr->cached) {
+ bch2_bkey_drop_ptr_noerror(bkey_i_to_s(insert), ptr);
+ /*
+ * See comment below:
bch2_extent_ptr_set_cached(bkey_i_to_s(insert), ptr);
+ */
rewrites_found |= 1U << i;
}
i++;
@@ -205,7 +209,14 @@ restart_drop_extra_replicas:
if (!p.ptr.cached &&
durability - ptr_durability >= m->op.opts.data_replicas) {
durability -= ptr_durability;
+ bch2_bkey_drop_ptr_noerror(bkey_i_to_s(insert), &entry->ptr);
+ /*
+ * Currently, we're dropping unneeded replicas
+ * instead of marking them as cached, since
+ * cached data in stripe buckets prevents them
+ * from being reused:
bch2_extent_ptr_set_cached(bkey_i_to_s(insert), &entry->ptr);
+ */
goto restart_drop_extra_replicas;
}
}