bcachefs: bch2_dev_get_ioref2(); debug.c
authorKent Overstreet <kent.overstreet@linux.dev>
Fri, 3 May 2024 16:55:55 +0000 (12:55 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Thu, 9 May 2024 20:23:35 +0000 (16:23 -0400)
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/debug.c

index b5aa4e5b224b6c5b020be0f045d417cb19884da2..d75735aad27e20ff97af0d3f0680dbb20ec1c964 100644 (file)
@@ -37,11 +37,11 @@ static bool bch2_btree_verify_replica(struct bch_fs *c, struct btree *b,
        struct btree_node *n_ondisk = c->verify_ondisk;
        struct btree_node *n_sorted = c->verify_data->data;
        struct bset *sorted, *inmemory = &b->data->keys;
-       struct bch_dev *ca = bch2_dev_bkey_exists(c, pick.ptr.dev);
        struct bio *bio;
        bool failed = false, saw_error = false;
 
-       if (!bch2_dev_get_ioref(ca, READ))
+       struct bch_dev *ca = bch2_dev_get_ioref2(c, pick.ptr.dev, READ);
+       if (!ca)
                return false;
 
        bio = bio_alloc_bioset(ca->disk_sb.bdev,
@@ -194,8 +194,8 @@ void bch2_btree_node_ondisk_to_text(struct printbuf *out, struct bch_fs *c,
                return;
        }
 
-       ca = bch2_dev_bkey_exists(c, pick.ptr.dev);
-       if (!bch2_dev_get_ioref(ca, READ)) {
+       ca = bch2_dev_get_ioref2(c, pick.ptr.dev, READ);
+       if (!ca) {
                prt_printf(out, "error getting device to read from: not online\n");
                return;
        }