diff options
Diffstat (limited to 'libbcachefs/extents.c')
| -rw-r--r-- | libbcachefs/extents.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libbcachefs/extents.c b/libbcachefs/extents.c index 9efaa1ff..b85af711 100644 --- a/libbcachefs/extents.c +++ b/libbcachefs/extents.c @@ -144,7 +144,7 @@ bch2_extent_has_group(struct bch_fs *c, struct bkey_s_c_extent e, unsigned group const struct bch_extent_ptr *ptr; extent_for_each_ptr(e, ptr) { - struct bch_dev *ca = c->devs[ptr->dev]; + struct bch_dev *ca = bch_dev_bkey_exists(c, ptr->dev); if (ca->mi.group && ca->mi.group - 1 == group) @@ -159,13 +159,11 @@ bch2_extent_has_target(struct bch_fs *c, struct bkey_s_c_extent e, unsigned targ { const struct bch_extent_ptr *ptr; - extent_for_each_ptr(e, ptr) { - struct bch_dev *ca = bch_dev_bkey_exists(c, ptr->dev); - - if (dev_in_target(ca, target) && - (!ptr->cached || !ptr_stale(ca, ptr))) + extent_for_each_ptr(e, ptr) + if (bch2_dev_in_target(c, ptr->dev, target) && + (!ptr->cached || + !ptr_stale(bch_dev_bkey_exists(c, ptr->dev), ptr))) return ptr; - } return NULL; } @@ -732,7 +730,7 @@ err: bch2_fs_bug(c, "%s btree pointer %s: bucket %zi " "gen %i mark %08x", err, buf, PTR_BUCKET_NR(ca, ptr), - mark.gen, (unsigned) mark.counter); + mark.gen, (unsigned) mark.v.counter); } void bch2_btree_ptr_to_text(struct bch_fs *c, char *buf, @@ -2024,7 +2022,7 @@ void bch2_extent_mark_replicas_cached(struct bch_fs *c, int n = bch2_extent_ptr_durability(c, ptr); if (n && n <= extra && - !dev_in_target(c->devs[ptr->dev], target)) { + !bch2_dev_in_target(c, ptr->dev, target)) { ptr->cached = true; extra -= n; } |