mirror of
https://github.com/koverstreet/bcachefs-tools.git
synced 2025-03-10 00:00:04 +03:00
Update bcachefs sources to 4c24a1cf56 bcachefs: Fix BCH_FS_ERROR flag handling
This commit is contained in:
parent
50bc63a6ce
commit
1d2315ca0a
@ -1 +1 @@
|
|||||||
2152e671d805a531496b649b593e0a1918069d84
|
4c24a1cf56583a3da1e14eb1bce2c3240d860b06
|
||||||
|
@ -1632,7 +1632,7 @@ again:
|
|||||||
|
|
||||||
bch2_mark_superblocks(c);
|
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) &&
|
!test_bit(BCH_FS_INITIAL_GC_DONE, &c->flags) &&
|
||||||
c->opts.fix_errors != FSCK_OPT_NO) {
|
c->opts.fix_errors != FSCK_OPT_NO) {
|
||||||
bch_info(c, "starting topology repair pass");
|
bch_info(c, "starting topology repair pass");
|
||||||
|
@ -439,16 +439,6 @@ int bch2_sb_to_fs(struct bch_fs *c, struct bch_sb *src)
|
|||||||
|
|
||||||
__copy_super(&c->disk_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))
|
if (BCH_SB_INITIALIZED(c->disk_sb.sb))
|
||||||
set_bit(BCH_FS_INITIALIZED, &c->flags);
|
set_bit(BCH_FS_INITIALIZED, &c->flags);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user