alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update bcachefs sources to 44ac32df8e0c bcachefs: Split brain detection

Browse Source
This commit is contained in:
Kent Overstreet 2023-12-23 19:55:43 -05:00
parent d01f3f590c
commit d101ad4a61
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
72740a707b64a4fb5f2bb559d8db27a66abc97cc 44ac32df8e0c112b76c841088d93c7e923aada80

2
libbcachefs/opts.h
View File

@ -389,7 +389,7 @@ enum fsck_err_opts {
BCH2_NO_SB_OPT, BCH_SB_SECTOR, \ BCH2_NO_SB_OPT, BCH_SB_SECTOR, \
"offset", "Sector offset of superblock") \ "offset", "Sector offset of superblock") \
x(read_only, u8, \ x(read_only, u8, \
OPT_FS, \ OPT_FS|OPT_MOUNT, \
OPT_BOOL(), \ OPT_BOOL(), \
BCH2_NO_SB_OPT, false, \ BCH2_NO_SB_OPT, false, \
NULL, NULL) \ NULL, NULL) \

6
libbcachefs/recovery.c
View File

@ -737,7 +737,7 @@ int bch2_fs_recovery(struct bch_fs *c)
goto err; goto err;
} }
if (c->opts.fsck || !(c->opts.nochanges && c->opts.norecovery)) if (!(c->opts.nochanges && c->opts.norecovery))
check_version_upgrade(c); check_version_upgrade(c);
if (c->opts.fsck && c->opts.norecovery) { if (c->opts.fsck && c->opts.norecovery) {
@ -979,7 +979,9 @@ out:
bch2_journal_keys_put_initial(c); bch2_journal_keys_put_initial(c);
kfree(clean); kfree(clean);
if (!ret && test_bit(BCH_FS_need_delete_dead_snapshots, &c->flags)) { if (!ret &&
test_bit(BCH_FS_need_delete_dead_snapshots, &c->flags) &&
!c->opts.nochanges) {
bch2_fs_read_write_early(c); bch2_fs_read_write_early(c);
bch2_delete_dead_snapshots_async(c); bch2_delete_dead_snapshots_async(c);
} }

23
libbcachefs/super.c
View File

@ -433,16 +433,6 @@ static int __bch2_fs_read_write(struct bch_fs *c, bool early)
if (test_bit(BCH_FS_rw, &c->flags)) if (test_bit(BCH_FS_rw, &c->flags))
return 0; return 0;
if (c->opts.norecovery)
return -BCH_ERR_erofs_norecovery;
/*
* nochanges is used for fsck -n mode - we have to allow going rw
* during recovery for that to work:
*/
if (c->opts.nochanges && (!early || c->opts.read_only))
return -BCH_ERR_erofs_nochanges;
bch_info(c, "going read-write"); bch_info(c, "going read-write");
ret = bch2_sb_members_v2_init(c); ret = bch2_sb_members_v2_init(c);
@ -510,6 +500,12 @@ err:
int bch2_fs_read_write(struct bch_fs *c) int bch2_fs_read_write(struct bch_fs *c)
{ {
if (c->opts.norecovery)
return -BCH_ERR_erofs_norecovery;
if (c->opts.nochanges)
return -BCH_ERR_erofs_nochanges;
return __bch2_fs_read_write(c, false); return __bch2_fs_read_write(c, false);
} }
@ -1033,7 +1029,7 @@ int bch2_fs_start(struct bch_fs *c)
set_bit(BCH_FS_started, &c->flags); set_bit(BCH_FS_started, &c->flags);
if (c->opts.read_only || c->opts.nochanges) { if (c->opts.read_only) {
bch2_fs_read_only(c); bch2_fs_read_only(c);
} else { } else {
ret = !test_bit(BCH_FS_rw, &c->flags) ret = !test_bit(BCH_FS_rw, &c->flags)
@ -1996,6 +1992,11 @@ struct bch_fs *bch2_fs_open(char * const *devices, unsigned nr_devices,
BUG_ON(darray_push(&sbs, sb)); BUG_ON(darray_push(&sbs, sb));
} }
if (opts.nochanges && !opts.read_only) {
ret = -BCH_ERR_erofs_nochanges;
goto err_print;
}
darray_for_each(sbs, sb) darray_for_each(sbs, sb)
if (!best || sb_cmp(sb->sb, best->sb) > 0) if (!best || sb_cmp(sb->sb, best->sb) > 0)
best = sb; best = sb;