diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-03 00:39:26 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-03 00:39:26 -0500 |
| commit | 1ee7dc7a55273d34358a0ee525a9e823c999ffe6 (patch) | |
| tree | a4fa4357fe99c483b08458a1fcc0de304cb1eb25 /libbcachefs/data_update.c | |
| parent | d010a21653d34d80044c5a1d7702802b264a2a6c (diff) | |
Update bcachefs sources to 2272c5f5b7 bcachefs: Mark stripe buckets with correct data type
Diffstat (limited to 'libbcachefs/data_update.c')
| -rw-r--r-- | libbcachefs/data_update.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libbcachefs/data_update.c b/libbcachefs/data_update.c index e1467e1..ca46947 100644 --- a/libbcachefs/data_update.c +++ b/libbcachefs/data_update.c @@ -426,7 +426,7 @@ int bch2_data_update_init(struct btree_trans *trans, struct extent_ptr_decoded p; const struct bch_extent_ptr *ptr; unsigned i, reserve_sectors = k.k->size * data_opts.extra_replicas; - unsigned int ptrs_locked = 0; + unsigned ptrs_locked = 0; int ret; bch2_bkey_buf_init(&m->k); @@ -439,6 +439,7 @@ int bch2_data_update_init(struct btree_trans *trans, m->op.version = k.k->version; m->op.target = data_opts.target; m->op.write_point = wp; + m->op.nr_replicas = 0; m->op.flags |= BCH_WRITE_PAGES_STABLE| BCH_WRITE_PAGES_OWNED| BCH_WRITE_DATA_ENCODED| @@ -457,17 +458,16 @@ int bch2_data_update_init(struct btree_trans *trans, bkey_for_each_ptr_decode(k.k, ptrs, p, entry) { bool locked; - if (((1U << i) & m->data_opts.rewrite_ptrs) && - p.ptr.cached) - BUG(); + if (((1U << i) & m->data_opts.rewrite_ptrs)) { + BUG_ON(p.ptr.cached); - if (!((1U << i) & m->data_opts.rewrite_ptrs) && - !p.ptr.cached) - bch2_dev_list_add_dev(&m->op.devs_have, p.ptr.dev); + if (crc_is_compressed(p.crc)) + reserve_sectors += k.k->size; - if (((1U << i) & m->data_opts.rewrite_ptrs) && - crc_is_compressed(p.crc)) - reserve_sectors += k.k->size; + m->op.nr_replicas += bch2_extent_ptr_durability(c, &p); + } else if (!p.ptr.cached) { + bch2_dev_list_add_dev(&m->op.devs_have, p.ptr.dev); + } /* * op->csum_type is normally initialized from the fs/file's @@ -514,8 +514,8 @@ int bch2_data_update_init(struct btree_trans *trans, goto err; } - m->op.nr_replicas = m->op.nr_replicas_required = - hweight32(m->data_opts.rewrite_ptrs) + m->data_opts.extra_replicas; + m->op.nr_replicas += m->data_opts.extra_replicas; + m->op.nr_replicas_required = m->op.nr_replicas; BUG_ON(!m->op.nr_replicas); |