bcachefs: Fix bch2_gc_done() error messages
authorKent Overstreet <kent.overstreet@gmail.com>
Thu, 15 Apr 2021 00:22:10 +0000 (20:22 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:09:00 +0000 (17:09 -0400)
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/btree_gc.c

index b61d27de5cd70b4024c4d96ca6376b5e80c750a2..068cfbb2c489a5ed25b421be84c8632d8e4d8767 100644 (file)
@@ -828,7 +828,7 @@ static int bch2_gc_done(struct bch_fs *c,
        if (dst->b[b].mark._f != src->b[b].mark._f) {                   \
                if (verify)                                             \
                        fsck_err(c, "bucket %u:%zu gen %u data type %s has wrong " #_f  \
-                               ": got %u, should be %u", i, b,         \
+                               ": got %u, should be %u", dev, b,       \
                                dst->b[b].mark.gen,                     \
                                bch2_data_types[dst->b[b].mark.data_type],\
                                dst->b[b].mark._f, src->b[b].mark._f);  \
@@ -836,7 +836,7 @@ static int bch2_gc_done(struct bch_fs *c,
                set_bit(BCH_FS_NEED_ALLOC_WRITE, &c->flags);            \
        }
 #define copy_dev_field(_f, _msg, ...)                                  \
-       copy_field(_f, "dev %u has wrong " _msg, i, ##__VA_ARGS__)
+       copy_field(_f, "dev %u has wrong " _msg, dev, ##__VA_ARGS__)
 #define copy_fs_field(_f, _msg, ...)                                   \
        copy_field(_f, "fs has wrong " _msg, ##__VA_ARGS__)