Update bcachefs sources to 4c24a1cf56 bcachefs: Fix BCH_FS_ERROR flag handling

diff --git a/.bcachefs_revision b/.bcachefs_revision
index 4b121b1335847b9fceb37b68f544d80ed9c28b8a..e4c9f20858304718401857075ca770cca6d319fd 100644 (file)
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-2152e671d805a531496b649b593e0a1918069d84
+4c24a1cf56583a3da1e14eb1bce2c3240d860b06

diff --git a/libbcachefs/btree_gc.c b/libbcachefs/btree_gc.c
index 3ec43ca563bea78d2a72961ac23b7f4b1cf12f89..091bddee575dab80a876b3fb0b426a6cb45a7cee 100644 (file)
--- a/libbcachefs/btree_gc.c
+++ b/libbcachefs/btree_gc.c
@@ -1632,7 +1632,7 @@ again:
 
        bch2_mark_superblocks(c);
 
-       if (test_bit(BCH_FS_TOPOLOGY_ERROR, &c->flags) &&
+       if (BCH_SB_HAS_TOPOLOGY_ERRORS(c->disk_sb.sb) &&
            !test_bit(BCH_FS_INITIAL_GC_DONE, &c->flags) &&
            c->opts.fix_errors != FSCK_OPT_NO) {
                bch_info(c, "starting topology repair pass");

diff --git a/libbcachefs/super-io.c b/libbcachefs/super-io.c
index 802976333ec817d863fc30741b787ffb3151d777..88a8e54fbd7aea47243cfa1f5038fd9aabcb280e 100644 (file)
--- a/libbcachefs/super-io.c
+++ b/libbcachefs/super-io.c
@@ -439,16 +439,6 @@ int bch2_sb_to_fs(struct bch_fs *c, struct bch_sb *src)
 
        __copy_super(&c->disk_sb, src);
 
-       if (BCH_SB_HAS_ERRORS(c->disk_sb.sb))
-               set_bit(BCH_FS_ERROR, &c->flags);
-       else
-               clear_bit(BCH_FS_ERROR, &c->flags);
-
-       if (BCH_SB_HAS_TOPOLOGY_ERRORS(c->disk_sb.sb))
-               set_bit(BCH_FS_TOPOLOGY_ERROR, &c->flags);
-       else
-               clear_bit(BCH_FS_TOPOLOGY_ERROR, &c->flags);
-
        if (BCH_SB_INITIALIZED(c->disk_sb.sb))
                set_bit(BCH_FS_INITIALIZED, &c->flags);