bcachefs: Fix copygc of compressed data
authorKent Overstreet <kent.overstreet@gmail.com>
Fri, 16 Oct 2020 02:23:02 +0000 (22:23 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:08:44 +0000 (17:08 -0400)
The check for when we need to get a disk reservation was wrong.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/move.c

index 9967dd422e4d9096e1c2dcaa885fcc3f767ed6df..8aa13b41d20d0c1d27ead8322ed01fdb991d280f 100644 (file)
@@ -296,14 +296,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.cached &&
-                           crc_is_compressed(p.crc) &&
-                           bch2_dev_in_target(c, p.ptr.dev, data_opts.target))
+                       if (p.ptr.dev == data_opts.rewrite_dev &&
+                           !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,
-                                       compressed_sectors,
+                                       k.k->size * m->op.nr_replicas,
                                        BCH_DISK_RESERVATION_NOFAIL);
                        if (ret)
                                return ret;