summaryrefslogtreecommitdiff
path: root/libbcachefs/move.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-12-11 17:25:34 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2021-12-11 17:26:14 -0500
commit39a6bf885d4d8e9a59879931216b4b0f7a2571eb (patch)
tree4cf0156d661dd1a0812ff884d42fdb36b067fbe9 /libbcachefs/move.c
parent2fc5a50bd67ec1d8d7930bbf9dfe03e86884277a (diff)
Update bcachefs sources to 6bb1ba5c94 bcachefs: Improve alloc_mem_to_key()
Diffstat (limited to 'libbcachefs/move.c')
-rw-r--r--libbcachefs/move.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/libbcachefs/move.c b/libbcachefs/move.c
index f0495451..f73be9cb 100644
--- a/libbcachefs/move.c
+++ b/libbcachefs/move.c
@@ -394,10 +394,14 @@ int bch2_migrate_write_init(struct bch_fs *c, struct migrate_write *m,
unsigned compressed_sectors = 0;
bkey_for_each_ptr_decode(k.k, ptrs, p, entry)
- if (p.ptr.dev == data_opts.rewrite_dev &&
- !p.ptr.cached &&
- crc_is_compressed(p.crc))
- compressed_sectors += p.crc.compressed_size;
+ if (p.ptr.dev == data_opts.rewrite_dev) {
+ if (p.ptr.cached)
+ m->op.flags |= BCH_WRITE_CACHED;
+
+ if (!p.ptr.cached &&
+ crc_is_compressed(p.crc))
+ compressed_sectors += p.crc.compressed_size;
+ }
if (compressed_sectors) {
ret = bch2_disk_reservation_add(c, &m->op.res,