bcachefs: Clear BCH_FEATURE_extents_above_btree_updates on clean shutdown

This is needed so that users can roll back to before "d9bb516b2d
bcachefs: Move extent overwrite handling out of core btree code", which
it appears may still be buggy.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index 27378cc9cdd5e72db1b998e0607183c7862135ff..02b381cb567b38e484d4c6c6a3256371e576842e 100644 (file)
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -805,8 +805,6 @@ int bch2_fs_recovery(struct bch_fs *c)
                goto err;
        }
 
-       c->disk_sb.sb->features[0] |= 1ULL << BCH_FEATURE_extents_above_btree_updates;
-
        ret = journal_replay_early(c, clean, &journal_entries);
        if (ret)
                goto err;

diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c
index 4c1e8571d87241dfcfd662ba6ab2d7778b0193e9..2db88afd6bda16d0632eaf336d7b35f7c4732616 100644 (file)
--- a/fs/bcachefs/super-io.c
+++ b/fs/bcachefs/super-io.c
@@ -956,6 +956,7 @@ int bch2_fs_mark_dirty(struct bch_fs *c)
        mutex_lock(&c->sb_lock);
        SET_BCH_SB_CLEAN(c->disk_sb.sb, false);
        c->disk_sb.sb->compat[0] &= ~(1ULL << BCH_COMPAT_FEAT_ALLOC_METADATA);
+       c->disk_sb.sb->features[0] |= 1ULL << BCH_FEATURE_extents_above_btree_updates;
        ret = bch2_write_super(c);
        mutex_unlock(&c->sb_lock);
 
@@ -1087,6 +1088,7 @@ void bch2_fs_mark_clean(struct bch_fs *c)
 
        c->disk_sb.sb->compat[0] |= 1ULL << BCH_COMPAT_FEAT_ALLOC_INFO;
        c->disk_sb.sb->compat[0] |= 1ULL << BCH_COMPAT_FEAT_ALLOC_METADATA;
+       c->disk_sb.sb->features[0] &= ~(1ULL << BCH_FEATURE_extents_above_btree_updates);
 
        u64s = sizeof(*sb_clean) / sizeof(u64) + c->journal.entry_u64s_reserved;