]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/fsck.c
Update bcachefs sources to e67d924a90 bcachefs: Introduce bch2_journal_keys_peek_...
[bcachefs-tools-debian] / libbcachefs / fsck.c
index 835ef11496d2c5ede6372d555faa282a01584397..d2b155f07fc10a185dde5fbd80ca3cfa02db36a6 100644 (file)
@@ -3,6 +3,7 @@
 #include "bcachefs.h"
 #include "bkey_buf.h"
 #include "btree_update.h"
+#include "darray.h"
 #include "dirent.h"
 #include "error.h"
 #include "fs-common.h"
@@ -471,11 +472,11 @@ static int snapshots_seen_update(struct bch_fs *c, struct snapshots_seen *s, str
        pos.snapshot = snapshot_t(c, pos.snapshot)->equiv;
 
        if (bkey_cmp(s->pos, pos))
-               s->nr = 0;
+               s->ids.nr = 0;
        s->pos = pos;
 
        /* Might get called multiple times due to lock restarts */
-       if (s->nr && s->d[s->nr - 1] == pos.snapshot)
+       if (s->ids.nr && s->ids.data[s->ids.nr - 1] == pos.snapshot)
                return 0;
 
        return snapshots_seen_add(c, s, pos.snapshot);
@@ -498,7 +499,7 @@ static bool key_visible_in_snapshot(struct bch_fs *c, struct snapshots_seen *see
        ancestor        = snapshot_t(c, ancestor)->equiv;
 
        /* @ancestor should be the snapshot most recently added to @seen */
-       BUG_ON(!seen->nr || seen->d[seen->nr - 1] != ancestor);
+       BUG_ON(!seen->ids.nr || seen->ids.data[seen->ids.nr - 1] != ancestor);
        BUG_ON(seen->pos.snapshot != ancestor);
 
        if (id == ancestor)
@@ -507,11 +508,11 @@ static bool key_visible_in_snapshot(struct bch_fs *c, struct snapshots_seen *see
        if (!bch2_snapshot_is_ancestor(c, id, ancestor))
                return false;
 
-       for (i = seen->nr - 2;
-            i >= 0 && seen->d[i] >= id;
+       for (i = seen->ids.nr - 2;
+            i >= 0 && seen->ids.data[i] >= id;
             --i)
-               if (bch2_snapshot_is_ancestor(c, id, seen->d[i]) &&
-                   bch2_snapshot_is_ancestor(c, seen->d[i], ancestor))
+               if (bch2_snapshot_is_ancestor(c, id, seen->ids.data[i]) &&
+                   bch2_snapshot_is_ancestor(c, seen->ids.data[i], ancestor))
                        return false;
 
        return true;
@@ -537,26 +538,25 @@ static int ref_visible(struct bch_fs *c, struct snapshots_seen *s,
 }
 
 #define for_each_visible_inode(_c, _s, _w, _snapshot, _i)      \
-       for (_i = (_w)->d; _i < (_w)->d + (_w)->nr && (_i)->snapshot <= (_snapshot); _i++)\
+       for (_i = (_w)->inodes.data; _i < (_w)->inodes.data + (_w)->inodes.nr && (_i)->snapshot <= (_snapshot); _i++)\
                if (key_visible_in_snapshot(_c, _s, _i->snapshot, _snapshot))
 
+struct inode_walker_entry {
+       struct bch_inode_unpacked inode;
+       u32                     snapshot;
+       u64                     count;
+};
+
 struct inode_walker {
        bool                            first_this_inode;
        u64                             cur_inum;
 
-       size_t                          nr;
-       size_t                          size;
-       struct inode_walker_entry {
-               struct bch_inode_unpacked inode;
-               u32                     snapshot;
-               u64                     count;
-       } *d;
+       DARRAY(struct inode_walker_entry) inodes;
 };
 
 static void inode_walker_exit(struct inode_walker *w)
 {
-       kfree(w->d);
-       w->d = NULL;
+       darray_exit(w->inodes);
 }
 
 static struct inode_walker inode_walker_init(void)
@@ -564,40 +564,17 @@ static struct inode_walker inode_walker_init(void)
        return (struct inode_walker) { 0, };
 }
 
-static int inode_walker_realloc(struct inode_walker *w)
-{
-       if (w->nr == w->size) {
-               size_t new_size = max_t(size_t, 8UL, w->size * 2);
-               void *d = krealloc(w->d, new_size * sizeof(w->d[0]),
-                                  GFP_KERNEL);
-               if (!d)
-                       return -ENOMEM;
-
-               w->d = d;
-               w->size = new_size;
-       }
-
-       return 0;
-}
-
 static int add_inode(struct bch_fs *c, struct inode_walker *w,
                     struct bkey_s_c inode)
 {
        struct bch_inode_unpacked u;
-       int ret;
-
-       ret = inode_walker_realloc(w);
-       if (ret)
-               return ret;
 
        BUG_ON(bch2_inode_unpack(inode, &u));
 
-       w->d[w->nr++] = (struct inode_walker_entry) {
+       return darray_push(w->inodes, ((struct inode_walker_entry) {
                .inode          = u,
                .snapshot       = snapshot_t(c, inode.k->p.snapshot)->equiv,
-       };
-
-       return 0;
+       }));
 }
 
 static int __walk_inode(struct btree_trans *trans,
@@ -616,7 +593,7 @@ static int __walk_inode(struct btree_trans *trans,
                goto lookup_snapshot;
        }
 
-       w->nr = 0;
+       w->inodes.nr = 0;
 
        for_each_btree_key(trans, iter, BTREE_ID_inodes, POS(0, pos.inode),
                           BTREE_ITER_ALL_SNAPSHOTS, k, ret) {
@@ -634,26 +611,25 @@ static int __walk_inode(struct btree_trans *trans,
        w->cur_inum             = pos.inode;
        w->first_this_inode     = true;
 lookup_snapshot:
-       for (i = 0; i < w->nr; i++)
-               if (bch2_snapshot_is_ancestor(c, pos.snapshot, w->d[i].snapshot))
+       for (i = 0; i < w->inodes.nr; i++)
+               if (bch2_snapshot_is_ancestor(c, pos.snapshot, w->inodes.data[i].snapshot))
                        goto found;
        return INT_MAX;
 found:
-       BUG_ON(pos.snapshot > w->d[i].snapshot);
+       BUG_ON(pos.snapshot > w->inodes.data[i].snapshot);
 
-       if (pos.snapshot != w->d[i].snapshot) {
+       if (pos.snapshot != w->inodes.data[i].snapshot) {
                ancestor_pos = i;
 
-               while (i && w->d[i - 1].snapshot > pos.snapshot)
+               while (i && w->inodes.data[i - 1].snapshot > pos.snapshot)
                        --i;
 
-               ret = inode_walker_realloc(w);
+               ret = darray_insert_item(w->inodes, i, w->inodes.data[ancestor_pos]);
                if (ret)
                        return ret;
 
-               array_insert_item(w->d, w->nr, i, w->d[ancestor_pos]);
-               w->d[i].snapshot = pos.snapshot;
-               w->d[i].count   = 0;
+               w->inodes.data[i].snapshot = pos.snapshot;
+               w->inodes.data[i].count = 0;
        }
 
        return i;
@@ -669,7 +645,7 @@ static int __get_visible_inodes(struct btree_trans *trans,
        struct bkey_s_c k;
        int ret;
 
-       w->nr = 0;
+       w->inodes.nr = 0;
 
        for_each_btree_key(trans, iter, BTREE_ID_inodes, POS(0, inum),
                           BTREE_ITER_ALL_SNAPSHOTS, k, ret) {
@@ -695,15 +671,16 @@ static int check_key_has_snapshot(struct btree_trans *trans,
                                  struct bkey_s_c k)
 {
        struct bch_fs *c = trans->c;
-       char buf[200];
+       struct printbuf buf = PRINTBUF;
        int ret = 0;
 
        if (mustfix_fsck_err_on(!snapshot_t(c, k.k->p.snapshot)->equiv, c,
                        "key in missing snapshot: %s",
-                       (bch2_bkey_val_to_text(&PBUF(buf), c, k), buf)))
-               return bch2_btree_delete_at(trans, iter,
+                       (bch2_bkey_val_to_text(&buf, c, k), buf.buf)))
+               ret = bch2_btree_delete_at(trans, iter,
                                            BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?: 1;
 fsck_err:
+       printbuf_exit(&buf);
        return ret;
 }
 
@@ -743,7 +720,7 @@ static int hash_check_key(struct btree_trans *trans,
 {
        struct bch_fs *c = trans->c;
        struct btree_iter iter = { NULL };
-       char buf[200];
+       struct printbuf buf = PRINTBUF;
        struct bkey_s_c k;
        u64 hash;
        int ret = 0;
@@ -767,8 +744,9 @@ static int hash_check_key(struct btree_trans *trans,
                if (fsck_err_on(k.k->type == desc.key_type &&
                                !desc.cmp_bkey(k, hash_k), c,
                                "duplicate hash table keys:\n%s",
-                               (bch2_bkey_val_to_text(&PBUF(buf), c,
-                                                      hash_k), buf))) {
+                               (printbuf_reset(&buf),
+                                bch2_bkey_val_to_text(&buf, c, hash_k),
+                                buf.buf))) {
                        ret = bch2_hash_delete_at(trans, desc, hash_info, k_iter, 0) ?: 1;
                        break;
                }
@@ -779,13 +757,16 @@ static int hash_check_key(struct btree_trans *trans,
                }
 
        }
+out:
        bch2_trans_iter_exit(trans, &iter);
+       printbuf_exit(&buf);
        return ret;
 bad_hash:
        if (fsck_err(c, "hash table key at wrong offset: btree %u inode %llu offset %llu, "
                     "hashed to %llu\n%s",
                     desc.btree_id, hash_k.k->p.inode, hash_k.k->p.offset, hash,
-                    (bch2_bkey_val_to_text(&PBUF(buf), c, hash_k), buf)) == FSCK_ERR_IGNORE)
+                    (printbuf_reset(&buf),
+                     bch2_bkey_val_to_text(&buf, c, hash_k), buf.buf)) == FSCK_ERR_IGNORE)
                return 0;
 
        ret = hash_redo_key(trans, desc, hash_info, k_iter, hash_k);
@@ -793,9 +774,9 @@ bad_hash:
                bch_err(c, "hash_redo_key err %i", ret);
                return ret;
        }
-       return -EINTR;
+       ret = -EINTR;
 fsck_err:
-       return ret;
+       goto out;
 }
 
 static int check_inode(struct btree_trans *trans,
@@ -1125,16 +1106,16 @@ static int check_i_sectors(struct btree_trans *trans, struct inode_walker *w)
        int ret = 0, ret2 = 0;
        s64 count2;
 
-       for (i = w->d; i < w->d + w->nr; i++) {
+       darray_for_each(w->inodes, i) {
                if (i->inode.bi_sectors == i->count)
                        continue;
 
                count2 = lockrestart_do(trans,
                        bch2_count_inode_sectors(trans, w->cur_inum, i->snapshot));
 
-               if (fsck_err_on(i->count != count2, c,
-                               "fsck counted i_sectors wrong: got %llu should be %llu",
-                               i->count, count2)) {
+               if (i->count != count2) {
+                       bch_err(c, "fsck counted i_sectors wrong: got %llu should be %llu",
+                               i->count, count2);
                        i->count = count2;
                        if (i->inode.bi_sectors == i->count)
                                continue;
@@ -1163,32 +1144,43 @@ static int check_extent(struct btree_trans *trans, struct btree_iter *iter,
        struct bch_fs *c = trans->c;
        struct bkey_s_c k;
        struct inode_walker_entry *i;
-       char buf[200];
+       struct printbuf buf = PRINTBUF;
        int ret = 0;
-
+peek:
        k = bch2_btree_iter_peek(iter);
        if (!k.k)
-               return 0;
+               goto out;
 
        ret = bkey_err(k);
        if (ret)
-               return ret;
+               goto err;
 
        ret = check_key_has_snapshot(trans, iter, k);
-       if (ret)
-               return ret < 0 ? ret : 0;
+       if (ret) {
+               ret = ret < 0 ? ret : 0;
+               goto out;
+       }
 
        ret = snapshots_seen_update(c, s, k.k->p);
        if (ret)
-               return ret;
+               goto err;
 
        if (k.k->type == KEY_TYPE_whiteout)
-               return 0;
+               goto out;
 
        if (inode->cur_inum != k.k->p.inode) {
                ret = check_i_sectors(trans, inode);
                if (ret)
-                       return ret;
+                       goto err;
+       }
+
+       if (!iter->path->should_be_locked) {
+               /*
+                * hack: check_i_sectors may have handled a transaction restart,
+                * it shouldn't be but we need to fix the new i_sectors check
+                * code and delete the old bch2_count_inode_sectors() first
+                */
+               goto peek;
        }
 #if 0
        if (bkey_cmp(prev.k->k.p, bkey_start_pos(k.k)) > 0) {
@@ -1198,33 +1190,43 @@ static int check_extent(struct btree_trans *trans, struct btree_iter *iter,
                bch2_bkey_val_to_text(&PBUF(buf1), c, bkey_i_to_s_c(prev.k));
                bch2_bkey_val_to_text(&PBUF(buf2), c, k);
 
-               if (fsck_err(c, "overlapping extents:\n%s\n%s", buf1, buf2))
-                       return fix_overlapping_extent(trans, k, prev.k->k.p) ?: -EINTR;
+               if (fsck_err(c, "overlapping extents:\n%s\n%s", buf1, buf2)) {
+                       ret = fix_overlapping_extent(trans, k, prev.k->k.p) ?: -EINTR;
+                       goto out;
+               }
        }
 #endif
        ret = __walk_inode(trans, inode, k.k->p);
        if (ret < 0)
-               return ret;
+               goto err;
 
        if (fsck_err_on(ret == INT_MAX, c,
                        "extent in missing inode:\n  %s",
-                       (bch2_bkey_val_to_text(&PBUF(buf), c, k), buf)))
-               return bch2_btree_delete_at(trans, iter,
+                       (printbuf_reset(&buf),
+                        bch2_bkey_val_to_text(&buf, c, k), buf.buf))) {
+               ret = bch2_btree_delete_at(trans, iter,
                                            BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);
+               goto out;
+       }
 
-       if (ret == INT_MAX)
-               return 0;
+       if (ret == INT_MAX) {
+               ret = 0;
+               goto out;
+       }
 
-       i = inode->d + ret;
+       i = inode->inodes.data + ret;
        ret = 0;
 
        if (fsck_err_on(!S_ISREG(i->inode.bi_mode) &&
                        !S_ISLNK(i->inode.bi_mode), c,
                        "extent in non regular inode mode %o:\n  %s",
                        i->inode.bi_mode,
-                       (bch2_bkey_val_to_text(&PBUF(buf), c, k), buf)))
-               return bch2_btree_delete_at(trans, iter,
+                       (printbuf_reset(&buf),
+                        bch2_bkey_val_to_text(&buf, c, k), buf.buf))) {
+               ret = bch2_btree_delete_at(trans, iter,
                                            BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);
+               goto out;
+       }
 
        if (!bch2_snapshot_internal_node(c, k.k->p.snapshot)) {
                for_each_visible_inode(c, s, inode, k.k->p.snapshot, i) {
@@ -1234,11 +1236,12 @@ static int check_extent(struct btree_trans *trans, struct btree_iter *iter,
                                        "extent type %u offset %llu past end of inode %llu, i_size %llu",
                                        k.k->type, k.k->p.offset, k.k->p.inode, i->inode.bi_size)) {
                                bch2_fs_lazy_rw(c);
-                               return bch2_btree_delete_range_trans(trans, BTREE_ID_extents,
+                               ret = bch2_btree_delete_range_trans(trans, BTREE_ID_extents,
                                                SPOS(k.k->p.inode, round_up(i->inode.bi_size, block_bytes(c)) >> 9,
                                                     k.k->p.snapshot),
                                                POS(k.k->p.inode, U64_MAX),
                                                0, NULL) ?: -EINTR;
+                               goto out;
                        }
                }
        }
@@ -1250,7 +1253,10 @@ static int check_extent(struct btree_trans *trans, struct btree_iter *iter,
        bch2_bkey_buf_reassemble(&prev, c, k);
 #endif
 
+out:
+err:
 fsck_err:
+       printbuf_exit(&buf);
        return ret;
 }
 
@@ -1309,16 +1315,17 @@ static int check_subdir_count(struct btree_trans *trans, struct inode_walker *w)
        int ret = 0, ret2 = 0;
        s64 count2;
 
-       for (i = w->d; i < w->d + w->nr; i++) {
+       darray_for_each(w->inodes, i) {
                if (i->inode.bi_nlink == i->count)
                        continue;
 
-               count2 = lockrestart_do(trans,
-                               bch2_count_subdirs(trans, w->cur_inum, i->snapshot));
+               count2 = bch2_count_subdirs(trans, w->cur_inum, i->snapshot);
+               if (count2 < 0)
+                       return count2;
 
-               if (fsck_err_on(i->count != count2, c,
-                               "directory %llu:%u: fsck counted subdirectories wrong, got %llu should be %llu",
-                               w->cur_inum, i->snapshot, i->count, count2)) {
+               if (i->count != count2) {
+                       bch_err(c, "fsck counted subdirectories wrong: got %llu should be %llu",
+                               i->count, count2);
                        i->count = count2;
                        if (i->inode.bi_nlink == i->count)
                                continue;
@@ -1347,7 +1354,7 @@ static int check_dirent_target(struct btree_trans *trans,
        struct bch_fs *c = trans->c;
        struct bkey_i_dirent *n;
        bool backpointer_exists = true;
-       char buf[200];
+       struct printbuf buf = PRINTBUF;
        int ret = 0;
 
        if (!target->bi_dir &&
@@ -1373,9 +1380,7 @@ static int check_dirent_target(struct btree_trans *trans,
                                "directory %llu with multiple links",
                                target->bi_inum)) {
                        ret = __remove_dirent(trans, d.k->p);
-                       if (ret)
-                               goto err;
-                       return 0;
+                       goto out;
                }
 
                if (fsck_err_on(backpointer_exists &&
@@ -1412,18 +1417,19 @@ static int check_dirent_target(struct btree_trans *trans,
                        "incorrect d_type: got %s, should be %s:\n%s",
                        bch2_d_type_str(d.v->d_type),
                        bch2_d_type_str(inode_d_type(target)),
-                       (bch2_bkey_val_to_text(&PBUF(buf), c, d.s_c), buf))) {
+                       (printbuf_reset(&buf),
+                        bch2_bkey_val_to_text(&buf, c, d.s_c), buf.buf))) {
                n = bch2_trans_kmalloc(trans, bkey_bytes(d.k));
                ret = PTR_ERR_OR_ZERO(n);
                if (ret)
-                       return ret;
+                       goto err;
 
                bkey_reassemble(&n->k_i, d.s_c);
                n->v.d_type = inode_d_type(target);
 
                ret = bch2_trans_update(trans, iter, &n->k_i, 0);
                if (ret)
-                       return ret;
+                       goto err;
 
                d = dirent_i_to_s_c(n);
        }
@@ -1437,19 +1443,21 @@ static int check_dirent_target(struct btree_trans *trans,
                n = bch2_trans_kmalloc(trans, bkey_bytes(d.k));
                ret = PTR_ERR_OR_ZERO(n);
                if (ret)
-                       return ret;
+                       goto err;
 
                bkey_reassemble(&n->k_i, d.s_c);
                n->v.d_parent_subvol = cpu_to_le32(target->bi_parent_subvol);
 
                ret = bch2_trans_update(trans, iter, &n->k_i, 0);
                if (ret)
-                       return ret;
+                       goto err;
 
                d = dirent_i_to_s_c(n);
        }
+out:
 err:
 fsck_err:
+       printbuf_exit(&buf);
        return ret;
 }
 
@@ -1463,68 +1471,86 @@ static int check_dirent(struct btree_trans *trans, struct btree_iter *iter,
        struct bkey_s_c k;
        struct bkey_s_c_dirent d;
        struct inode_walker_entry *i;
-       char buf[200];
-       int ret;
-
+       struct printbuf buf = PRINTBUF;
+       int ret = 0;
+peek:
        k = bch2_btree_iter_peek(iter);
        if (!k.k)
-               return 0;
+               goto out;
 
        ret = bkey_err(k);
        if (ret)
-               return ret;
+               goto err;
 
        ret = check_key_has_snapshot(trans, iter, k);
-       if (ret)
-               return ret < 0 ? ret : 0;
+       if (ret) {
+               ret = ret < 0 ? ret : 0;
+               goto out;
+       }
 
        ret = snapshots_seen_update(c, s, k.k->p);
        if (ret)
-               return ret;
+               goto err;
 
        if (k.k->type == KEY_TYPE_whiteout)
-               return 0;
+               goto out;
 
        if (dir->cur_inum != k.k->p.inode) {
                ret = check_subdir_count(trans, dir);
                if (ret)
-                       return ret;
+                       goto err;
+       }
+
+       if (!iter->path->should_be_locked) {
+               /* hack: see check_extent() */
+               goto peek;
        }
 
        ret = __walk_inode(trans, dir, k.k->p);
        if (ret < 0)
-               return ret;
+               goto err;
 
        if (fsck_err_on(ret == INT_MAX, c,
                        "dirent in nonexisting directory:\n%s",
-                       (bch2_bkey_val_to_text(&PBUF(buf), c, k), buf)))
-               return bch2_btree_delete_at(trans, iter,
+                       (printbuf_reset(&buf),
+                        bch2_bkey_val_to_text(&buf, c, k), buf.buf))) {
+               ret = bch2_btree_delete_at(trans, iter,
                                BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);
+               goto out;
+       }
 
-       if (ret == INT_MAX)
-               return 0;
+       if (ret == INT_MAX) {
+               ret = 0;
+               goto out;
+       }
 
-       i = dir->d + ret;
+       i = dir->inodes.data + ret;
        ret = 0;
 
        if (fsck_err_on(!S_ISDIR(i->inode.bi_mode), c,
                        "dirent in non directory inode type %s:\n%s",
                        bch2_d_type_str(inode_d_type(&i->inode)),
-                       (bch2_bkey_val_to_text(&PBUF(buf), c, k), buf)))
-               return bch2_btree_delete_at(trans, iter, 0);
+                       (printbuf_reset(&buf),
+                        bch2_bkey_val_to_text(&buf, c, k), buf.buf))) {
+               ret = bch2_btree_delete_at(trans, iter, 0);
+               goto out;
+       }
 
        if (dir->first_this_inode)
-               *hash_info = bch2_hash_info_init(c, &dir->d[0].inode);
+               *hash_info = bch2_hash_info_init(c, &dir->inodes.data[0].inode);
 
        ret = hash_check_key(trans, bch2_dirent_hash_desc,
                             hash_info, iter, k);
        if (ret < 0)
-               return ret;
-       if (ret) /* dirent has been deleted */
-               return 0;
+               goto err;
+       if (ret) {
+               /* dirent has been deleted */
+               ret = 0;
+               goto out;
+       }
 
        if (k.k->type != KEY_TYPE_dirent)
-               return 0;
+               goto out;
 
        d = bkey_s_c_to_dirent(k);
 
@@ -1537,24 +1563,27 @@ static int check_dirent(struct btree_trans *trans, struct btree_iter *iter,
                ret = __subvol_lookup(trans, target_subvol,
                                      &target_snapshot, &target_inum);
                if (ret && ret != -ENOENT)
-                       return ret;
+                       goto err;
 
                if (fsck_err_on(ret, c,
                                "dirent points to missing subvolume %llu",
-                               le64_to_cpu(d.v->d_child_subvol)))
-                       return __remove_dirent(trans, d.k->p);
+                               le64_to_cpu(d.v->d_child_subvol))) {
+                       ret = __remove_dirent(trans, d.k->p);
+                       goto err;
+               }
 
                ret = __lookup_inode(trans, target_inum,
                                   &subvol_root, &target_snapshot);
                if (ret && ret != -ENOENT)
-                       return ret;
+                       goto err;
 
                if (fsck_err_on(ret, c,
                                "subvolume %u points to missing subvolume root %llu",
                                target_subvol,
                                target_inum)) {
                        bch_err(c, "repair not implemented yet");
-                       return -EINVAL;
+                       ret = -EINVAL;
+                       goto err;
                }
 
                if (fsck_err_on(subvol_root.bi_subvol != target_subvol, c,
@@ -1564,32 +1593,33 @@ static int check_dirent(struct btree_trans *trans, struct btree_iter *iter,
                        subvol_root.bi_subvol = target_subvol;
                        ret = __write_inode(trans, &subvol_root, target_snapshot);
                        if (ret)
-                               return ret;
+                               goto err;
                }
 
                ret = check_dirent_target(trans, iter, d, &subvol_root,
                                          target_snapshot);
                if (ret)
-                       return ret;
+                       goto err;
        } else {
                ret = __get_visible_inodes(trans, target, s, le64_to_cpu(d.v->d_inum));
                if (ret)
-                       return ret;
+                       goto err;
 
-               if (fsck_err_on(!target->nr, c,
+               if (fsck_err_on(!target->inodes.nr, c,
                                "dirent points to missing inode:\n%s",
-                               (bch2_bkey_val_to_text(&PBUF(buf), c,
-                                                      k), buf))) {
+                               (printbuf_reset(&buf),
+                                bch2_bkey_val_to_text(&buf, c, k),
+                                buf.buf))) {
                        ret = __remove_dirent(trans, d.k->p);
                        if (ret)
-                               return ret;
+                               goto err;
                }
 
-               for (i = target->d; i < target->d + target->nr; i++) {
+               darray_for_each(target->inodes, i) {
                        ret = check_dirent_target(trans, iter, d,
                                                  &i->inode, i->snapshot);
                        if (ret)
-                               return ret;
+                               goto err;
                }
        }
 
@@ -1597,7 +1627,10 @@ static int check_dirent(struct btree_trans *trans, struct btree_iter *iter,
                for_each_visible_inode(c, s, dir, d.k->p.snapshot, i)
                        i->count++;
 
+out:
+err:
 fsck_err:
+       printbuf_exit(&buf);
        return ret;
 }
 
@@ -1680,7 +1713,7 @@ static int check_xattr(struct btree_trans *trans, struct btree_iter *iter,
        ret = 0;
 
        if (inode->first_this_inode)
-               *hash_info = bch2_hash_info_init(c, &inode->d[0].inode);
+               *hash_info = bch2_hash_info_init(c, &inode->inodes.data[0].inode);
 
        ret = hash_check_key(trans, bch2_xattr_hash_desc, hash_info, iter, k);
 fsck_err:
@@ -1790,21 +1823,18 @@ static int check_root(struct bch_fs *c)
                check_root_trans(&trans));
 }
 
-struct pathbuf {
-       size_t          nr;
-       size_t          size;
-
-       struct pathbuf_entry {
-               u64     inum;
-               u32     snapshot;
-       }               *entries;
+struct pathbuf_entry {
+       u64     inum;
+       u32     snapshot;
 };
 
-static bool path_is_dup(struct pathbuf *p, u64 inum, u32 snapshot)
+typedef DARRAY(struct pathbuf_entry) pathbuf;
+
+static bool path_is_dup(pathbuf *p, u64 inum, u32 snapshot)
 {
        struct pathbuf_entry *i;
 
-       for (i = p->entries; i < p->entries + p->nr; i++)
+       darray_for_each(*p, i)
                if (i->inum     == inum &&
                    i->snapshot == snapshot)
                        return true;
@@ -1812,26 +1842,18 @@ static bool path_is_dup(struct pathbuf *p, u64 inum, u32 snapshot)
        return false;
 }
 
-static int path_down(struct pathbuf *p, u64 inum, u32 snapshot)
+static int path_down(struct bch_fs *c, pathbuf *p,
+                    u64 inum, u32 snapshot)
 {
-       if (p->nr == p->size) {
-               size_t new_size = max_t(size_t, 256UL, p->size * 2);
-               void *n = krealloc(p->entries,
-                                  new_size * sizeof(p->entries[0]),
-                                  GFP_KERNEL);
-               if (!n) {
-                       return -ENOMEM;
-               }
-
-               p->entries = n;
-               p->size = new_size;
-       };
-
-       p->entries[p->nr++] = (struct pathbuf_entry) {
+       int ret = darray_push(*p, ((struct pathbuf_entry) {
                .inum           = inum,
                .snapshot       = snapshot,
-       };
-       return 0;
+       }));
+
+       if (ret)
+               bch_err(c, "fsck: error allocating memory for pathbuf, size %zu",
+                       p->size);
+       return ret;
 }
 
 /*
@@ -1840,7 +1862,7 @@ static int path_down(struct pathbuf *p, u64 inum, u32 snapshot)
  * XXX: we should also be verifying that inodes are in the right subvolumes
  */
 static int check_path(struct btree_trans *trans,
-                     struct pathbuf *p,
+                     pathbuf *p,
                      struct bch_inode_unpacked *inode,
                      u32 snapshot)
 {
@@ -1893,7 +1915,7 @@ static int check_path(struct btree_trans *trans,
                if (!S_ISDIR(inode->bi_mode))
                        break;
 
-               ret = path_down(p, inode->bi_inum, snapshot);
+               ret = path_down(c, p, inode->bi_inum, snapshot);
                if (ret) {
                        bch_err(c, "memory allocation failure");
                        return ret;
@@ -1914,7 +1936,7 @@ static int check_path(struct btree_trans *trans,
                        /* XXX print path */
                        bch_err(c, "directory structure loop");
 
-                       for (i = p->entries; i < p->entries + p->nr; i++)
+                       darray_for_each(*p, i)
                                pr_err("%llu:%u", i->inum, i->snapshot);
                        pr_err("%llu:%u", inode->bi_inum, snapshot);
 
@@ -1951,7 +1973,7 @@ static int check_directory_structure(struct bch_fs *c)
        struct btree_iter iter;
        struct bkey_s_c k;
        struct bch_inode_unpacked u;
-       struct pathbuf path = { 0, 0, NULL };
+       pathbuf path = { 0, };
        int ret;
 
        bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0);
@@ -1981,7 +2003,7 @@ static int check_directory_structure(struct bch_fs *c)
 
        BUG_ON(ret == -EINTR);
 
-       kfree(path.entries);
+       darray_exit(path);
 
        bch2_trans_exit(&trans);
        return ret;
@@ -1998,12 +2020,15 @@ struct nlink_table {
        }               *d;
 };
 
-static int add_nlink(struct nlink_table *t, u64 inum, u32 snapshot)
+static int add_nlink(struct bch_fs *c, struct nlink_table *t,
+                    u64 inum, u32 snapshot)
 {
        if (t->nr == t->size) {
                size_t new_size = max_t(size_t, 128UL, t->size * 2);
                void *d = kvmalloc(new_size * sizeof(t->d[0]), GFP_KERNEL);
                if (!d) {
+                       bch_err(c, "fsck: error allocating memory for nlink_table, size %zu",
+                               new_size);
                        return -ENOMEM;
                }
 
@@ -2093,7 +2118,7 @@ static int check_nlinks_find_hardlinks(struct bch_fs *c,
                if (!u.bi_nlink)
                        continue;
 
-               ret = add_nlink(t, k.k->p.offset, k.k->p.snapshot);
+               ret = add_nlink(c, t, k.k->p.offset, k.k->p.snapshot);
                if (ret) {
                        *end = k.k->p.offset;
                        ret = 0;