Update bcachefs sources to fb39031ade bcachefs: bch2_sb_maybe_downgrade(), bch2_sb_up...

[bcachefs-tools-debian] / libbcachefs / recovery.c

diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c
index 995e1b13f63ec87bcdb466d7c215c8ab4577d8c7..47adb667a46ab6eaac0f13ca7f81cfa594a03cab 100644 (file)
--- a/libbcachefs/recovery.c
+++ b/libbcachefs/recovery.c
@@ -1169,8 +1169,7 @@ static void check_version_upgrade(struct bch_fs *c)
                c->opts.fix_errors      = FSCK_OPT_YES;
 
                mutex_lock(&c->sb_lock);
-               c->disk_sb.sb->version = cpu_to_le16(new_version);
-               c->disk_sb.sb->features[0] |= cpu_to_le64(BCH_SB_FEATURES_ALL);
+               bch2_sb_upgrade(c, new_version);
                mutex_unlock(&c->sb_lock);
 
                printbuf_exit(&buf);
@@ -1528,10 +1527,11 @@ int bch2_fs_initialize(struct bch_fs *c)
        c->disk_sb.sb->compat[0] |= cpu_to_le64(1ULL << BCH_COMPAT_extents_above_btree_updates_done);
        c->disk_sb.sb->compat[0] |= cpu_to_le64(1ULL << BCH_COMPAT_bformat_overflow_done);
 
+       bch2_sb_maybe_downgrade(c);
+
        if (c->opts.version_upgrade != BCH_VERSION_UPGRADE_none) {
-               c->disk_sb.sb->version = cpu_to_le16(bcachefs_metadata_version_current);
+               bch2_sb_upgrade(c, bcachefs_metadata_version_current);
                SET_BCH_SB_VERSION_UPGRADE_COMPLETE(c->disk_sb.sb, bcachefs_metadata_version_current);
-               c->disk_sb.sb->features[0] |= cpu_to_le64(BCH_SB_FEATURES_ALL);
                bch2_write_super(c);
        }
        mutex_unlock(&c->sb_lock);