diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-27 19:38:36 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-27 19:38:36 -0400 |
| commit | d320a4e927fd706b34c714b77130965a385ea4fb (patch) | |
| tree | f993f8a9eb9bfe61c337ec98195907f10e3916f8 /libbcachefs/data_update.c | |
| parent | 8eaf8ddf45fbcd9900b561f2804f145f06417db5 (diff) | |
Update bcachefs sources to 6628827a8707 bcachefs: Skip deleted members in member_to_text()
Diffstat (limited to 'libbcachefs/data_update.c')
| -rw-r--r-- | libbcachefs/data_update.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libbcachefs/data_update.c b/libbcachefs/data_update.c index d116f2f0..0771a6d8 100644 --- a/libbcachefs/data_update.c +++ b/libbcachefs/data_update.c @@ -162,11 +162,7 @@ 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++; @@ -212,14 +208,8 @@ 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; } } |