]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/recovery.c
Update bcachefs sources to 7e03c1ab0e bcachefs: Kill bchfs_extent_update()
[bcachefs-tools-debian] / libbcachefs / recovery.c
index 3a20a77474f11106ad05a429de122ac1753b30a6..095eef3828ceca486ee6020cc73cc7f793f4e8f5 100644 (file)
+// SPDX-License-Identifier: GPL-2.0
 
 #include "bcachefs.h"
-#include "alloc.h"
+#include "alloc_background.h"
 #include "btree_gc.h"
 #include "btree_update.h"
 #include "btree_update_interior.h"
 #include "btree_io.h"
+#include "buckets.h"
 #include "dirent.h"
+#include "ec.h"
 #include "error.h"
+#include "fs-common.h"
 #include "fsck.h"
 #include "journal_io.h"
+#include "journal_reclaim.h"
+#include "journal_seq_blacklist.h"
 #include "quota.h"
 #include "recovery.h"
+#include "replicas.h"
 #include "super-io.h"
 
+#include <linux/sort.h>
 #include <linux/stat.h>
 
 #define QSTR(n) { { { .len = strlen(n) } }, .name = n }
 
-struct bkey_i *btree_root_find(struct bch_fs *c,
-                              struct bch_sb_field_clean *clean,
-                              struct jset *j,
-                              enum btree_id id, unsigned *level)
+/* iterate over keys read from the journal: */
+
+struct journal_iter bch2_journal_iter_init(struct journal_keys *keys,
+                                          enum btree_id id)
+{
+       return (struct journal_iter) {
+               .keys           = keys,
+               .k              = keys->d,
+               .btree_id       = id,
+       };
+}
+
+struct bkey_s_c bch2_journal_iter_peek(struct journal_iter *iter)
+{
+       while (1) {
+               if (iter->k == iter->keys->d + iter->keys->nr)
+                       return bkey_s_c_null;
+
+               if (iter->k->btree_id == iter->btree_id)
+                       return bkey_i_to_s_c(iter->k->k);
+
+               iter->k++;
+       }
+
+       return bkey_s_c_null;
+}
+
+struct bkey_s_c bch2_journal_iter_next(struct journal_iter *iter)
+{
+       if (iter->k == iter->keys->d + iter->keys->nr)
+               return bkey_s_c_null;
+
+       iter->k++;
+       return bch2_journal_iter_peek(iter);
+}
+
+/* sort and dedup all keys in the journal: */
+
+static void journal_entries_free(struct list_head *list)
+{
+
+       while (!list_empty(list)) {
+               struct journal_replay *i =
+                       list_first_entry(list, struct journal_replay, list);
+               list_del(&i->list);
+               kvpfree(i, offsetof(struct journal_replay, j) +
+                       vstruct_bytes(&i->j));
+       }
+}
+
+static int journal_sort_key_cmp(const void *_l, const void *_r)
+{
+       const struct journal_key *l = _l;
+       const struct journal_key *r = _r;
+
+       return cmp_int(l->btree_id, r->btree_id) ?:
+               bkey_cmp(l->pos, r->pos) ?:
+               cmp_int(l->journal_seq, r->journal_seq) ?:
+               cmp_int(l->journal_offset, r->journal_offset);
+}
+
+static int journal_sort_seq_cmp(const void *_l, const void *_r)
+{
+       const struct journal_key *l = _l;
+       const struct journal_key *r = _r;
+
+       return cmp_int(l->journal_seq, r->journal_seq) ?:
+               cmp_int(l->btree_id, r->btree_id) ?:
+               bkey_cmp(l->pos, r->pos);
+}
+
+static void journal_keys_sift(struct journal_keys *keys, struct journal_key *i)
+{
+       while (i + 1 < keys->d + keys->nr &&
+              journal_sort_key_cmp(i, i + 1) > 0) {
+               swap(i[0], i[1]);
+               i++;
+       }
+}
+
+static void journal_keys_free(struct journal_keys *keys)
+{
+       struct journal_key *i;
+
+       for_each_journal_key(*keys, i)
+               if (i->allocated)
+                       kfree(i->k);
+       kvfree(keys->d);
+       keys->d = NULL;
+       keys->nr = 0;
+}
+
+static struct journal_keys journal_keys_sort(struct list_head *journal_entries)
+{
+       struct journal_replay *p;
+       struct jset_entry *entry;
+       struct bkey_i *k, *_n;
+       struct journal_keys keys = { NULL }, keys_deduped = { NULL };
+       struct journal_key *i;
+       size_t nr_keys = 0;
+
+       list_for_each_entry(p, journal_entries, list)
+               for_each_jset_key(k, _n, entry, &p->j)
+                       nr_keys++;
+
+       keys.journal_seq_base = keys_deduped.journal_seq_base =
+               le64_to_cpu(list_first_entry(journal_entries,
+                                            struct journal_replay,
+                                            list)->j.seq);
+
+       keys.d = kvmalloc(sizeof(keys.d[0]) * nr_keys, GFP_KERNEL);
+       if (!keys.d)
+               goto err;
+
+       keys_deduped.d = kvmalloc(sizeof(keys.d[0]) * nr_keys * 2, GFP_KERNEL);
+       if (!keys_deduped.d)
+               goto err;
+
+       list_for_each_entry(p, journal_entries, list)
+               for_each_jset_key(k, _n, entry, &p->j)
+                       keys.d[keys.nr++] = (struct journal_key) {
+                               .btree_id       = entry->btree_id,
+                               .pos            = bkey_start_pos(&k->k),
+                               .k              = k,
+                               .journal_seq    = le64_to_cpu(p->j.seq) -
+                                       keys.journal_seq_base,
+                               .journal_offset = k->_data - p->j._data,
+                       };
+
+       sort(keys.d, nr_keys, sizeof(keys.d[0]), journal_sort_key_cmp, NULL);
+
+       i = keys.d;
+       while (i < keys.d + keys.nr) {
+               if (i + 1 < keys.d + keys.nr &&
+                   i[0].btree_id == i[1].btree_id &&
+                   !bkey_cmp(i[0].pos, i[1].pos)) {
+                       if (bkey_cmp(i[0].k->k.p, i[1].k->k.p) <= 0) {
+                               i++;
+                       } else {
+                               bch2_cut_front(i[1].k->k.p, i[0].k);
+                               i[0].pos = i[1].k->k.p;
+                               journal_keys_sift(&keys, i);
+                       }
+                       continue;
+               }
+
+               if (i + 1 < keys.d + keys.nr &&
+                   i[0].btree_id == i[1].btree_id &&
+                   bkey_cmp(i[0].k->k.p, bkey_start_pos(&i[1].k->k)) > 0) {
+                       if ((cmp_int(i[0].journal_seq, i[1].journal_seq) ?:
+                            cmp_int(i[0].journal_offset, i[1].journal_offset)) < 0) {
+                               if (bkey_cmp(i[0].k->k.p, i[1].k->k.p) <= 0) {
+                                       bch2_cut_back(bkey_start_pos(&i[1].k->k), &i[0].k->k);
+                               } else {
+                                       struct bkey_i *split =
+                                               kmalloc(bkey_bytes(i[0].k), GFP_KERNEL);
+
+                                       if (!split)
+                                               goto err;
+
+                                       bkey_copy(split, i[0].k);
+                                       bch2_cut_back(bkey_start_pos(&i[1].k->k), &split->k);
+                                       keys_deduped.d[keys_deduped.nr++] = (struct journal_key) {
+                                               .btree_id       = i[0].btree_id,
+                                               .allocated      = true,
+                                               .pos            = bkey_start_pos(&split->k),
+                                               .k              = split,
+                                               .journal_seq    = i[0].journal_seq,
+                                               .journal_offset = i[0].journal_offset,
+                                       };
+
+                                       bch2_cut_front(i[1].k->k.p, i[0].k);
+                                       i[0].pos = i[1].k->k.p;
+                                       journal_keys_sift(&keys, i);
+                                       continue;
+                               }
+                       } else {
+                               if (bkey_cmp(i[0].k->k.p, i[1].k->k.p) >= 0) {
+                                       i[1] = i[0];
+                                       i++;
+                                       continue;
+                               } else {
+                                       bch2_cut_front(i[0].k->k.p, i[1].k);
+                                       i[1].pos = i[0].k->k.p;
+                                       journal_keys_sift(&keys, i + 1);
+                                       continue;
+                               }
+                       }
+               }
+
+               keys_deduped.d[keys_deduped.nr++] = *i++;
+       }
+
+       kvfree(keys.d);
+       return keys_deduped;
+err:
+       journal_keys_free(&keys_deduped);
+       kvfree(keys.d);
+       return (struct journal_keys) { NULL };
+}
+
+/* journal replay: */
+
+static void replay_now_at(struct journal *j, u64 seq)
+{
+       BUG_ON(seq < j->replay_journal_seq);
+       BUG_ON(seq > j->replay_journal_seq_end);
+
+       while (j->replay_journal_seq < seq)
+               bch2_journal_pin_put(j, j->replay_journal_seq++);
+}
+
+static int bch2_extent_replay_key(struct bch_fs *c, enum btree_id btree_id,
+                                 struct bkey_i *k)
+{
+       struct btree_trans trans;
+       struct btree_iter *iter, *split_iter;
+       /*
+        * We might cause compressed extents to be split, so we need to pass in
+        * a disk_reservation:
+        */
+       struct disk_reservation disk_res =
+               bch2_disk_reservation_init(c, 0);
+       struct bkey_i *split;
+       struct bpos atomic_end;
+       /*
+        * Some extents aren't equivalent - w.r.t. what the triggers do
+        * - if they're split:
+        */
+       bool remark_if_split = bch2_extent_is_compressed(bkey_i_to_s_c(k)) ||
+               k->k.type == KEY_TYPE_reflink_p;
+       bool remark = false;
+       int ret;
+
+       bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0);
+retry:
+       bch2_trans_begin(&trans);
+
+       iter = bch2_trans_get_iter(&trans, btree_id,
+                                  bkey_start_pos(&k->k),
+                                  BTREE_ITER_INTENT);
+
+       do {
+               ret = bch2_btree_iter_traverse(iter);
+               if (ret)
+                       goto err;
+
+               atomic_end = bpos_min(k->k.p, iter->l[0].b->key.k.p);
+
+               split_iter = bch2_trans_copy_iter(&trans, iter);
+               ret = PTR_ERR_OR_ZERO(split_iter);
+               if (ret)
+                       goto err;
+
+               split = bch2_trans_kmalloc(&trans, bkey_bytes(&k->k));
+               ret = PTR_ERR_OR_ZERO(split);
+               if (ret)
+                       goto err;
+
+               if (!remark &&
+                   remark_if_split &&
+                   bkey_cmp(atomic_end, k->k.p) < 0) {
+                       ret = bch2_disk_reservation_add(c, &disk_res,
+                                       k->k.size *
+                                       bch2_bkey_nr_dirty_ptrs(bkey_i_to_s_c(k)),
+                                       BCH_DISK_RESERVATION_NOFAIL);
+                       BUG_ON(ret);
+
+                       remark = true;
+               }
+
+               bkey_copy(split, k);
+               bch2_cut_front(split_iter->pos, split);
+               bch2_cut_back(atomic_end, &split->k);
+
+               bch2_trans_update(&trans, split_iter, split);
+               bch2_btree_iter_set_pos(iter, split->k.p);
+       } while (bkey_cmp(iter->pos, k->k.p) < 0);
+
+       if (remark) {
+               ret = bch2_trans_mark_key(&trans, bkey_i_to_s_c(k),
+                                         0, -((s64) k->k.size),
+                                         BCH_BUCKET_MARK_OVERWRITE) ?:
+                     bch2_trans_commit(&trans, &disk_res, NULL,
+                                       BTREE_INSERT_ATOMIC|
+                                       BTREE_INSERT_NOFAIL|
+                                       BTREE_INSERT_LAZY_RW|
+                                       BTREE_INSERT_NOMARK_OVERWRITES|
+                                       BTREE_INSERT_NO_CLEAR_REPLICAS);
+       } else {
+               ret = bch2_trans_commit(&trans, &disk_res, NULL,
+                                       BTREE_INSERT_ATOMIC|
+                                       BTREE_INSERT_NOFAIL|
+                                       BTREE_INSERT_LAZY_RW|
+                                       BTREE_INSERT_JOURNAL_REPLAY|
+                                       BTREE_INSERT_NOMARK);
+       }
+
+       if (ret)
+               goto err;
+err:
+       if (ret == -EINTR)
+               goto retry;
+
+       bch2_disk_reservation_put(c, &disk_res);
+
+       return bch2_trans_exit(&trans) ?: ret;
+}
+
+static int bch2_journal_replay(struct bch_fs *c,
+                              struct journal_keys keys)
+{
+       struct journal *j = &c->journal;
+       struct journal_key *i;
+       int ret;
+
+       sort(keys.d, keys.nr, sizeof(keys.d[0]), journal_sort_seq_cmp, NULL);
+
+       for_each_journal_key(keys, i) {
+               replay_now_at(j, keys.journal_seq_base + i->journal_seq);
+
+               if (i->btree_id == BTREE_ID_ALLOC)
+                       ret = bch2_alloc_replay_key(c, i->k);
+               else if (btree_node_type_is_extents(i->btree_id))
+                       ret = bch2_extent_replay_key(c, i->btree_id, i->k);
+               else
+                       ret = bch2_btree_insert(c, i->btree_id, i->k,
+                                               NULL, NULL,
+                                               BTREE_INSERT_NOFAIL|
+                                               BTREE_INSERT_LAZY_RW|
+                                               BTREE_INSERT_JOURNAL_REPLAY|
+                                               BTREE_INSERT_NOMARK);
+
+               if (ret) {
+                       bch_err(c, "journal replay: error %d while replaying key",
+                               ret);
+                       return ret;
+               }
+
+               cond_resched();
+       }
+
+       replay_now_at(j, j->replay_journal_seq_end);
+       j->replay_journal_seq = 0;
+
+       bch2_journal_set_replay_done(j);
+       bch2_journal_flush_all_pins(j);
+       return bch2_journal_error(j);
+}
+
+static bool journal_empty(struct list_head *journal)
+{
+       return list_empty(journal) ||
+               journal_entry_empty(&list_last_entry(journal,
+                                       struct journal_replay, list)->j);
+}
+
+static int
+verify_journal_entries_not_blacklisted_or_missing(struct bch_fs *c,
+                                                 struct list_head *journal)
+{
+       struct journal_replay *i =
+               list_last_entry(journal, struct journal_replay, list);
+       u64 start_seq   = le64_to_cpu(i->j.last_seq);
+       u64 end_seq     = le64_to_cpu(i->j.seq);
+       u64 seq         = start_seq;
+       int ret = 0;
+
+       list_for_each_entry(i, journal, list) {
+               fsck_err_on(seq != le64_to_cpu(i->j.seq), c,
+                       "journal entries %llu-%llu missing! (replaying %llu-%llu)",
+                       seq, le64_to_cpu(i->j.seq) - 1,
+                       start_seq, end_seq);
+
+               seq = le64_to_cpu(i->j.seq);
+
+               fsck_err_on(bch2_journal_seq_is_blacklisted(c, seq, false), c,
+                           "found blacklisted journal entry %llu", seq);
+
+               do {
+                       seq++;
+               } while (bch2_journal_seq_is_blacklisted(c, seq, false));
+       }
+fsck_err:
+       return ret;
+}
+
+/* journal replay early: */
+
+static int journal_replay_entry_early(struct bch_fs *c,
+                                     struct jset_entry *entry)
+{
+       int ret = 0;
+
+       switch (entry->type) {
+       case BCH_JSET_ENTRY_btree_root: {
+               struct btree_root *r;
+
+               if (entry->btree_id >= BTREE_ID_NR) {
+                       bch_err(c, "filesystem has unknown btree type %u",
+                               entry->btree_id);
+                       return -EINVAL;
+               }
+
+               r = &c->btree_roots[entry->btree_id];
+
+               if (entry->u64s) {
+                       r->level = entry->level;
+                       bkey_copy(&r->key, &entry->start[0]);
+                       r->error = 0;
+               } else {
+                       r->error = -EIO;
+               }
+               r->alive = true;
+               break;
+       }
+       case BCH_JSET_ENTRY_usage: {
+               struct jset_entry_usage *u =
+                       container_of(entry, struct jset_entry_usage, entry);
+
+               switch (entry->btree_id) {
+               case FS_USAGE_RESERVED:
+                       if (entry->level < BCH_REPLICAS_MAX)
+                               c->usage_base->persistent_reserved[entry->level] =
+                                       le64_to_cpu(u->v);
+                       break;
+               case FS_USAGE_INODES:
+                       c->usage_base->nr_inodes = le64_to_cpu(u->v);
+                       break;
+               case FS_USAGE_KEY_VERSION:
+                       atomic64_set(&c->key_version,
+                                    le64_to_cpu(u->v));
+                       break;
+               }
+
+               break;
+       }
+       case BCH_JSET_ENTRY_data_usage: {
+               struct jset_entry_data_usage *u =
+                       container_of(entry, struct jset_entry_data_usage, entry);
+               ret = bch2_replicas_set_usage(c, &u->r,
+                                             le64_to_cpu(u->v));
+               break;
+       }
+       case BCH_JSET_ENTRY_blacklist: {
+               struct jset_entry_blacklist *bl_entry =
+                       container_of(entry, struct jset_entry_blacklist, entry);
+
+               ret = bch2_journal_seq_blacklist_add(c,
+                               le64_to_cpu(bl_entry->seq),
+                               le64_to_cpu(bl_entry->seq) + 1);
+               break;
+       }
+       case BCH_JSET_ENTRY_blacklist_v2: {
+               struct jset_entry_blacklist_v2 *bl_entry =
+                       container_of(entry, struct jset_entry_blacklist_v2, entry);
+
+               ret = bch2_journal_seq_blacklist_add(c,
+                               le64_to_cpu(bl_entry->start),
+                               le64_to_cpu(bl_entry->end) + 1);
+               break;
+       }
+       }
+
+       return ret;
+}
+
+static int journal_replay_early(struct bch_fs *c,
+                               struct bch_sb_field_clean *clean,
+                               struct list_head *journal)
+{
+       struct jset_entry *entry;
+       int ret;
+
+       if (clean) {
+               c->bucket_clock[READ].hand = le16_to_cpu(clean->read_clock);
+               c->bucket_clock[WRITE].hand = le16_to_cpu(clean->write_clock);
+
+               for (entry = clean->start;
+                    entry != vstruct_end(&clean->field);
+                    entry = vstruct_next(entry)) {
+                       ret = journal_replay_entry_early(c, entry);
+                       if (ret)
+                               return ret;
+               }
+       } else {
+               struct journal_replay *i =
+                       list_last_entry(journal, struct journal_replay, list);
+
+               c->bucket_clock[READ].hand = le16_to_cpu(i->j.read_clock);
+               c->bucket_clock[WRITE].hand = le16_to_cpu(i->j.write_clock);
+
+               list_for_each_entry(i, journal, list)
+                       vstruct_for_each(&i->j, entry) {
+                               ret = journal_replay_entry_early(c, entry);
+                               if (ret)
+                                       return ret;
+                       }
+       }
+
+       bch2_fs_usage_initialize(c);
+
+       return 0;
+}
+
+/* sb clean section: */
+
+static struct bkey_i *btree_root_find(struct bch_fs *c,
+                                     struct bch_sb_field_clean *clean,
+                                     struct jset *j,
+                                     enum btree_id id, unsigned *level)
 {
        struct bkey_i *k;
        struct jset_entry *entry, *start, *end;
@@ -49,20 +564,24 @@ found:
 }
 
 static int verify_superblock_clean(struct bch_fs *c,
-                                  struct bch_sb_field_clean *clean,
+                                  struct bch_sb_field_clean **cleanp,
                                   struct jset *j)
 {
        unsigned i;
+       struct bch_sb_field_clean *clean = *cleanp;
        int ret = 0;
 
-       if (!clean || !j)
+       if (!c->sb.clean || !j)
                return 0;
 
        if (mustfix_fsck_err_on(j->seq != clean->journal_seq, c,
                        "superblock journal seq (%llu) doesn't match journal (%llu) after clean shutdown",
                        le64_to_cpu(clean->journal_seq),
-                       le64_to_cpu(j->seq)))
-               bch2_fs_mark_clean(c, false);
+                       le64_to_cpu(j->seq))) {
+               kfree(clean);
+               *cleanp = NULL;
+               return 0;
+       }
 
        mustfix_fsck_err_on(j->read_clock != clean->read_clock, c,
                        "superblock read clock doesn't match journal after clean shutdown");
@@ -91,199 +610,347 @@ fsck_err:
        return ret;
 }
 
-static bool journal_empty(struct list_head *journal)
+static struct bch_sb_field_clean *read_superblock_clean(struct bch_fs *c)
 {
-       struct journal_replay *i;
-       struct jset_entry *entry;
+       struct bch_sb_field_clean *clean, *sb_clean;
+       int ret;
 
-       if (list_empty(journal))
-               return true;
+       mutex_lock(&c->sb_lock);
+       sb_clean = bch2_sb_get_clean(c->disk_sb.sb);
+
+       if (fsck_err_on(!sb_clean, c,
+                       "superblock marked clean but clean section not present")) {
+               SET_BCH_SB_CLEAN(c->disk_sb.sb, false);
+               c->sb.clean = false;
+               mutex_unlock(&c->sb_lock);
+               return NULL;
+       }
 
-       i = list_last_entry(journal, struct journal_replay, list);
+       clean = kmemdup(sb_clean, vstruct_bytes(&sb_clean->field),
+                       GFP_KERNEL);
+       if (!clean) {
+               mutex_unlock(&c->sb_lock);
+               return ERR_PTR(-ENOMEM);
+       }
 
-       if (i->j.last_seq != i->j.seq)
-               return false;
+       if (le16_to_cpu(c->disk_sb.sb->version) <
+           bcachefs_metadata_version_bkey_renumber)
+               bch2_sb_clean_renumber(clean, READ);
 
-       list_for_each_entry(i, journal, list) {
-               vstruct_for_each(&i->j, entry) {
-                       if (entry->type == BCH_JSET_ENTRY_btree_root)
-                               continue;
-
-                       if (entry->type == BCH_JSET_ENTRY_btree_keys &&
-                           !entry->u64s)
-                               continue;
-                       return false;
+       mutex_unlock(&c->sb_lock);
+
+       return clean;
+fsck_err:
+       mutex_unlock(&c->sb_lock);
+       return ERR_PTR(ret);
+}
+
+static int read_btree_roots(struct bch_fs *c)
+{
+       unsigned i;
+       int ret = 0;
+
+       for (i = 0; i < BTREE_ID_NR; i++) {
+               struct btree_root *r = &c->btree_roots[i];
+
+               if (!r->alive)
+                       continue;
+
+               if (i == BTREE_ID_ALLOC &&
+                   c->opts.reconstruct_alloc) {
+                       c->sb.compat &= ~(1ULL << BCH_COMPAT_FEAT_ALLOC_INFO);
+                       continue;
+               }
+
+
+               if (r->error) {
+                       __fsck_err(c, i == BTREE_ID_ALLOC
+                                  ? FSCK_CAN_IGNORE : 0,
+                                  "invalid btree root %s",
+                                  bch2_btree_ids[i]);
+                       if (i == BTREE_ID_ALLOC)
+                               c->sb.compat &= ~(1ULL << BCH_COMPAT_FEAT_ALLOC_INFO);
+               }
+
+               ret = bch2_btree_root_read(c, i, &r->key, r->level);
+               if (ret) {
+                       __fsck_err(c, i == BTREE_ID_ALLOC
+                                  ? FSCK_CAN_IGNORE : 0,
+                                  "error reading btree root %s",
+                                  bch2_btree_ids[i]);
+                       if (i == BTREE_ID_ALLOC)
+                               c->sb.compat &= ~(1ULL << BCH_COMPAT_FEAT_ALLOC_INFO);
                }
        }
 
-       return true;
+       for (i = 0; i < BTREE_ID_NR; i++)
+               if (!c->btree_roots[i].b)
+                       bch2_btree_root_alloc(c, i);
+fsck_err:
+       return ret;
 }
 
 int bch2_fs_recovery(struct bch_fs *c)
 {
        const char *err = "cannot allocate memory";
-       struct bch_sb_field_clean *clean = NULL, *sb_clean = NULL;
-       LIST_HEAD(journal);
-       struct jset *j = NULL;
-       unsigned i;
+       struct bch_sb_field_clean *clean = NULL;
+       u64 journal_seq;
+       LIST_HEAD(journal_entries);
+       struct journal_keys journal_keys = { NULL };
+       bool wrote = false, write_sb = false;
        int ret;
 
-       mutex_lock(&c->sb_lock);
-       if (!bch2_sb_get_replicas(c->disk_sb.sb)) {
+       if (c->sb.clean)
+               clean = read_superblock_clean(c);
+       ret = PTR_ERR_OR_ZERO(clean);
+       if (ret)
+               goto err;
+
+       if (c->sb.clean)
+               bch_info(c, "recovering from clean shutdown, journal seq %llu",
+                        le64_to_cpu(clean->journal_seq));
+
+       if (!c->replicas.entries) {
                bch_info(c, "building replicas info");
                set_bit(BCH_FS_REBUILD_REPLICAS, &c->flags);
        }
 
-       if (c->sb.clean)
-               sb_clean = bch2_sb_get_clean(c->disk_sb.sb);
-       if (sb_clean) {
-               clean = kmemdup(sb_clean, vstruct_bytes(&sb_clean->field),
-                               GFP_KERNEL);
-               if (!clean) {
+       if (!c->sb.clean || c->opts.fsck) {
+               struct jset *j;
+
+               ret = bch2_journal_read(c, &journal_entries);
+               if (ret)
+                       goto err;
+
+               if (mustfix_fsck_err_on(c->sb.clean && !journal_empty(&journal_entries), c,
+                               "filesystem marked clean but journal not empty")) {
+                       c->sb.compat &= ~(1ULL << BCH_COMPAT_FEAT_ALLOC_INFO);
+                       SET_BCH_SB_CLEAN(c->disk_sb.sb, false);
+                       c->sb.clean = false;
+               }
+
+               if (!c->sb.clean && list_empty(&journal_entries)) {
+                       bch_err(c, "no journal entries found");
+                       ret = BCH_FSCK_REPAIR_IMPOSSIBLE;
+                       goto err;
+               }
+
+               journal_keys = journal_keys_sort(&journal_entries);
+               if (!journal_keys.d) {
                        ret = -ENOMEM;
-                       mutex_unlock(&c->sb_lock);
                        goto err;
                }
-       }
-       mutex_unlock(&c->sb_lock);
 
-       if (clean)
-               bch_info(c, "recovering from clean shutdown, journal seq %llu",
-                        le64_to_cpu(clean->journal_seq));
+               j = &list_last_entry(&journal_entries,
+                                    struct journal_replay, list)->j;
 
-       if (!clean || !c->opts.nofsck) {
-               ret = bch2_journal_read(c, &journal);
+               ret = verify_superblock_clean(c, &clean, j);
                if (ret)
                        goto err;
 
-               j = &list_entry(journal.prev, struct journal_replay, list)->j;
+               journal_seq = le64_to_cpu(j->seq) + 1;
        } else {
-               ret = bch2_journal_set_seq(c,
-                                          le64_to_cpu(clean->journal_seq),
-                                          le64_to_cpu(clean->journal_seq));
-               BUG_ON(ret);
+               journal_seq = le64_to_cpu(clean->journal_seq) + 1;
        }
 
-       ret = verify_superblock_clean(c, clean, j);
+       ret = journal_replay_early(c, clean, &journal_entries);
        if (ret)
                goto err;
 
-       fsck_err_on(clean && !journal_empty(&journal), c,
-                   "filesystem marked clean but journal not empty");
+       if (!c->sb.clean) {
+               ret = bch2_journal_seq_blacklist_add(c,
+                                                    journal_seq,
+                                                    journal_seq + 4);
+               if (ret) {
+                       bch_err(c, "error creating new journal seq blacklist entry");
+                       goto err;
+               }
 
-       if (clean) {
-               c->bucket_clock[READ].hand = le16_to_cpu(clean->read_clock);
-               c->bucket_clock[WRITE].hand = le16_to_cpu(clean->write_clock);
-       } else {
-               c->bucket_clock[READ].hand = le16_to_cpu(j->read_clock);
-               c->bucket_clock[WRITE].hand = le16_to_cpu(j->write_clock);
+               journal_seq += 4;
        }
 
-       for (i = 0; i < BTREE_ID_NR; i++) {
-               unsigned level;
-               struct bkey_i *k;
+       ret = bch2_blacklist_table_initialize(c);
 
-               k = btree_root_find(c, clean, j, i, &level);
-               if (!k)
-                       continue;
-
-               err = "invalid btree root pointer";
-               if (IS_ERR(k))
+       if (!list_empty(&journal_entries)) {
+               ret = verify_journal_entries_not_blacklisted_or_missing(c,
+                                                       &journal_entries);
+               if (ret)
                        goto err;
-
-               err = "error reading btree root";
-               if (bch2_btree_root_read(c, i, k, level)) {
-                       if (i != BTREE_ID_ALLOC)
-                               goto err;
-
-                       mustfix_fsck_err(c, "error reading btree root");
-               }
        }
 
-       for (i = 0; i < BTREE_ID_NR; i++)
-               if (!c->btree_roots[i].b)
-                       bch2_btree_root_alloc(c, i);
+       ret = bch2_fs_journal_start(&c->journal, journal_seq,
+                                   &journal_entries);
+       if (ret)
+               goto err;
 
-       err = "error reading allocation information";
-       ret = bch2_alloc_read(c, &journal);
+       ret = read_btree_roots(c);
        if (ret)
                goto err;
 
-       set_bit(BCH_FS_ALLOC_READ_DONE, &c->flags);
+       bch_verbose(c, "starting alloc read");
+       err = "error reading allocation information";
+       ret = bch2_alloc_read(c, &journal_keys);
+       if (ret)
+               goto err;
+       bch_verbose(c, "alloc read done");
 
-       bch_verbose(c, "starting mark and sweep:");
-       err = "error in recovery";
-       ret = bch2_initial_gc(c, &journal);
+       bch_verbose(c, "starting stripes_read");
+       err = "error reading stripes";
+       ret = bch2_stripes_read(c, &journal_keys);
        if (ret)
                goto err;
-       bch_verbose(c, "mark and sweep done");
+       bch_verbose(c, "stripes_read done");
 
-       if (c->opts.noreplay)
-               goto out;
+       set_bit(BCH_FS_ALLOC_READ_DONE, &c->flags);
 
-       /*
-        * Mark dirty before journal replay, fsck:
-        * XXX: after a clean shutdown, this could be done lazily only when fsck
-        * finds an error
-        */
-       bch2_fs_mark_clean(c, false);
+       if ((c->sb.compat & (1ULL << BCH_COMPAT_FEAT_ALLOC_INFO)) &&
+           !(c->sb.compat & (1ULL << BCH_COMPAT_FEAT_ALLOC_METADATA))) {
+               /*
+                * interior btree node updates aren't consistent with the
+                * journal; after an unclean shutdown we have to walk all
+                * pointers to metadata:
+                */
+               bch_info(c, "starting metadata mark and sweep");
+               err = "error in mark and sweep";
+               ret = bch2_gc(c, NULL, true, true);
+               if (ret)
+                       goto err;
+               bch_verbose(c, "mark and sweep done");
+       }
+
+       if (c->opts.fsck ||
+           !(c->sb.compat & (1ULL << BCH_COMPAT_FEAT_ALLOC_INFO)) ||
+           test_bit(BCH_FS_REBUILD_REPLICAS, &c->flags)) {
+               bch_info(c, "starting mark and sweep");
+               err = "error in mark and sweep";
+               ret = bch2_gc(c, &journal_keys, true, false);
+               if (ret)
+                       goto err;
+               bch_verbose(c, "mark and sweep done");
+       }
+
+       clear_bit(BCH_FS_REBUILD_REPLICAS, &c->flags);
+       set_bit(BCH_FS_INITIAL_GC_DONE, &c->flags);
 
        /*
-        * bch2_fs_journal_start() can't happen sooner, or btree_gc_finish()
-        * will give spurious errors about oldest_gen > bucket_gen -
-        * this is a hack but oh well.
+        * Skip past versions that might have possibly been used (as nonces),
+        * but hadn't had their pointers written:
         */
-       bch2_fs_journal_start(&c->journal);
+       if (c->sb.encryption_type && !c->sb.clean)
+               atomic64_add(1 << 16, &c->key_version);
 
-       err = "error starting allocator";
-       ret = bch2_fs_allocator_start(c);
-       if (ret)
-               goto err;
+       if (c->opts.norecovery)
+               goto out;
 
-       bch_verbose(c, "starting journal replay:");
+       bch_verbose(c, "starting journal replay");
        err = "journal replay failed";
-       ret = bch2_journal_replay(c, &journal);
+       ret = bch2_journal_replay(c, journal_keys);
        if (ret)
                goto err;
        bch_verbose(c, "journal replay done");
 
-       if (c->opts.norecovery)
-               goto out;
+       if (!c->opts.nochanges) {
+               /*
+                * note that even when filesystem was clean there might be work
+                * to do here, if we ran gc (because of fsck) which recalculated
+                * oldest_gen:
+                */
+               bch_verbose(c, "writing allocation info");
+               err = "error writing out alloc info";
+               ret = bch2_stripes_write(c, BTREE_INSERT_LAZY_RW, &wrote) ?:
+                       bch2_alloc_write(c, BTREE_INSERT_LAZY_RW, &wrote);
+               if (ret) {
+                       bch_err(c, "error writing alloc info");
+                       goto err;
+               }
+               bch_verbose(c, "alloc write done");
+       }
 
-       err = "error in fsck";
-       ret = bch2_fsck(c);
-       if (ret)
-               goto err;
+       if (!c->sb.clean) {
+               if (!(c->sb.features & (1 << BCH_FEATURE_ATOMIC_NLINK))) {
+                       bch_info(c, "checking inode link counts");
+                       err = "error in recovery";
+                       ret = bch2_fsck_inode_nlink(c);
+                       if (ret)
+                               goto err;
+                       bch_verbose(c, "check inodes done");
 
-       if (!test_bit(BCH_FS_FSCK_UNFIXED_ERRORS, &c->flags)) {
-               mutex_lock(&c->sb_lock);
-               c->disk_sb.sb->features[0] |= 1ULL << BCH_FEATURE_ATOMIC_NLINK;
-               mutex_unlock(&c->sb_lock);
+               } else {
+                       bch_verbose(c, "checking for deleted inodes");
+                       err = "error in recovery";
+                       ret = bch2_fsck_walk_inodes_only(c);
+                       if (ret)
+                               goto err;
+                       bch_verbose(c, "check inodes done");
+               }
+       }
+
+       if (c->opts.fsck) {
+               bch_info(c, "starting fsck");
+               err = "error in fsck";
+               ret = bch2_fsck_full(c);
+               if (ret)
+                       goto err;
+               bch_verbose(c, "fsck done");
        }
 
        if (enabled_qtypes(c)) {
-               bch_verbose(c, "reading quotas:");
+               bch_verbose(c, "reading quotas");
                ret = bch2_fs_quota_read(c);
                if (ret)
                        goto err;
                bch_verbose(c, "quotas done");
        }
 
+       mutex_lock(&c->sb_lock);
+       if (c->opts.version_upgrade) {
+               if (c->sb.version < bcachefs_metadata_version_new_versioning)
+                       c->disk_sb.sb->version_min =
+                               le16_to_cpu(bcachefs_metadata_version_min);
+               c->disk_sb.sb->version = le16_to_cpu(bcachefs_metadata_version_current);
+               write_sb = true;
+       }
+
+       if (!test_bit(BCH_FS_ERROR, &c->flags)) {
+               c->disk_sb.sb->compat[0] |= 1ULL << BCH_COMPAT_FEAT_ALLOC_INFO;
+               write_sb = true;
+       }
+
+       if (c->opts.fsck &&
+           !test_bit(BCH_FS_ERROR, &c->flags)) {
+               c->disk_sb.sb->features[0] |= 1ULL << BCH_FEATURE_ATOMIC_NLINK;
+               SET_BCH_SB_HAS_ERRORS(c->disk_sb.sb, 0);
+               write_sb = true;
+       }
+
+       if (write_sb)
+               bch2_write_super(c);
+       mutex_unlock(&c->sb_lock);
+
+       if (c->journal_seq_blacklist_table &&
+           c->journal_seq_blacklist_table->nr > 128)
+               queue_work(system_long_wq, &c->journal_seq_blacklist_gc_work);
 out:
-       bch2_journal_entries_free(&journal);
-       kfree(clean);
-       return ret;
+       ret = 0;
 err:
 fsck_err:
-       BUG_ON(!ret);
-       goto out;
+       set_bit(BCH_FS_FSCK_DONE, &c->flags);
+       bch2_flush_fsck_errs(c);
+
+       journal_keys_free(&journal_keys);
+       journal_entries_free(&journal_entries);
+       kfree(clean);
+       if (ret)
+               bch_err(c, "Error in recovery: %s (%i)", err, ret);
+       else
+               bch_verbose(c, "ret %i", ret);
+       return ret;
 }
 
 int bch2_fs_initialize(struct bch_fs *c)
 {
        struct bch_inode_unpacked root_inode, lostfound_inode;
        struct bkey_inode_buf packed_inode;
-       struct bch_hash_info root_hash_info;
        struct qstr lostfound = QSTR("lost+found");
        const char *err = "cannot allocate memory";
        struct bch_dev *ca;
@@ -293,38 +960,41 @@ int bch2_fs_initialize(struct bch_fs *c)
 
        bch_notice(c, "initializing new filesystem");
 
+       mutex_lock(&c->sb_lock);
+       for_each_online_member(ca, c, i)
+               bch2_mark_dev_superblock(c, ca, 0);
+       mutex_unlock(&c->sb_lock);
+
        set_bit(BCH_FS_ALLOC_READ_DONE, &c->flags);
+       set_bit(BCH_FS_INITIAL_GC_DONE, &c->flags);
 
-       ret = bch2_initial_gc(c, &journal);
-       if (ret)
-               goto err;
+       for (i = 0; i < BTREE_ID_NR; i++)
+               bch2_btree_root_alloc(c, i);
 
        err = "unable to allocate journal buckets";
-       for_each_online_member(ca, c, i)
-               if (bch2_dev_journal_alloc(ca)) {
+       for_each_online_member(ca, c, i) {
+               ret = bch2_dev_journal_alloc(ca);
+               if (ret) {
                        percpu_ref_put(&ca->io_ref);
                        goto err;
                }
-
-       for (i = 0; i < BTREE_ID_NR; i++)
-               bch2_btree_root_alloc(c, i);
+       }
 
        /*
         * journal_res_get() will crash if called before this has
         * set up the journal.pin FIFO and journal.cur pointer:
         */
-       bch2_fs_journal_start(&c->journal);
+       bch2_fs_journal_start(&c->journal, 1, &journal);
        bch2_journal_set_replay_done(&c->journal);
 
-       err = "error starting allocator";
-       ret = bch2_fs_allocator_start(c);
+       err = "error going read write";
+       ret = __bch2_fs_read_write(c, true);
        if (ret)
                goto err;
 
        bch2_inode_init(c, &root_inode, 0, 0,
                        S_IFDIR|S_IRWXU|S_IRUGO|S_IXUGO, 0, NULL);
        root_inode.bi_inum = BCACHEFS_ROOT_INO;
-       root_inode.bi_nlink++; /* lost+found */
        bch2_inode_pack(&packed_inode, &root_inode);
 
        err = "error creating root directory";
@@ -334,29 +1004,18 @@ int bch2_fs_initialize(struct bch_fs *c)
        if (ret)
                goto err;
 
-       bch2_inode_init(c, &lostfound_inode, 0, 0,
-                       S_IFDIR|S_IRWXU|S_IRUGO|S_IXUGO, 0,
-                       &root_inode);
-       lostfound_inode.bi_inum = BCACHEFS_ROOT_INO + 1;
-       bch2_inode_pack(&packed_inode, &lostfound_inode);
+       bch2_inode_init_early(c, &lostfound_inode);
 
        err = "error creating lost+found";
-       ret = bch2_btree_insert(c, BTREE_ID_INODES,
-                               &packed_inode.inode.k_i,
-                               NULL, NULL, 0);
-       if (ret)
-               goto err;
-
-       root_hash_info = bch2_hash_info_init(c, &root_inode);
-
-       ret = bch2_dirent_create(c, BCACHEFS_ROOT_INO, &root_hash_info, DT_DIR,
-                                &lostfound, lostfound_inode.bi_inum, NULL,
-                                BTREE_INSERT_NOFAIL);
+       ret = bch2_trans_do(c, NULL, BTREE_INSERT_ATOMIC,
+               bch2_create_trans(&trans, BCACHEFS_ROOT_INO,
+                                 &root_inode, &lostfound_inode,
+                                 &lostfound,
+                                 0, 0, 0755, 0,
+                                 NULL, NULL));
        if (ret)
                goto err;
 
-       atomic_long_set(&c->nr_inodes, 2);
-
        if (enabled_qtypes(c)) {
                ret = bch2_fs_quota_read(c);
                if (ret)
@@ -369,15 +1028,18 @@ int bch2_fs_initialize(struct bch_fs *c)
                goto err;
 
        mutex_lock(&c->sb_lock);
+       c->disk_sb.sb->version = c->disk_sb.sb->version_min =
+               le16_to_cpu(bcachefs_metadata_version_current);
+       c->disk_sb.sb->features[0] |= 1ULL << BCH_FEATURE_ATOMIC_NLINK;
+
        SET_BCH_SB_INITIALIZED(c->disk_sb.sb, true);
        SET_BCH_SB_CLEAN(c->disk_sb.sb, false);
-       c->disk_sb.sb->features[0] |= 1ULL << BCH_FEATURE_ATOMIC_NLINK;
 
        bch2_write_super(c);
        mutex_unlock(&c->sb_lock);
 
        return 0;
 err:
-       BUG_ON(!ret);
+       pr_err("Error initializing new filesystem: %s (%i)", err, ret);
        return ret;
 }