diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-11-21 16:26:39 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-11-21 16:26:39 -0500 |
| commit | 1d2315ca0a60e60a04921aece6587e1bfad17ccf (patch) | |
| tree | ac5fc35419b6d1840375c34da4adc80c06f904cc | |
| parent | 50bc63a6ce8d9e931206bbde87ead66874199077 (diff) | |
Update bcachefs sources to 4c24a1cf56 bcachefs: Fix BCH_FS_ERROR flag handling
| -rw-r--r-- | .bcachefs_revision | 2 | ||||
| -rw-r--r-- | libbcachefs/btree_gc.c | 2 | ||||
| -rw-r--r-- | libbcachefs/super-io.c | 10 |
3 files changed, 2 insertions, 12 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision index 4b121b13..e4c9f208 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -2152e671d805a531496b649b593e0a1918069d84 +4c24a1cf56583a3da1e14eb1bce2c3240d860b06 diff --git a/libbcachefs/btree_gc.c b/libbcachefs/btree_gc.c index 3ec43ca5..091bddee 100644 --- 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 80297633..88a8e54f 100644 --- 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); |