diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-03 21:56:27 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-03 22:03:31 -0400 |
| commit | 19005ecf086b1067362d907c185298d3a43e67e4 (patch) | |
| tree | 625f189f5ff1f425f43dac49f574533652688acf /libbcachefs/recovery.c | |
| parent | 2ab2ab0f781ae750473763e8a042c900a982d399 (diff) | |
Update bcachefs sources to defaad6d47 bcachefs: Fix an assertion when rebuilding replicas
Diffstat (limited to 'libbcachefs/recovery.c')
| -rw-r--r-- | libbcachefs/recovery.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c index 2b053e61..902f39f6 100644 --- a/libbcachefs/recovery.c +++ b/libbcachefs/recovery.c @@ -151,7 +151,7 @@ int bch2_fs_recovery(struct bch_fs *c) bch_info(c, "recovering from clean shutdown, journal seq %llu", le64_to_cpu(clean->journal_seq)); - if (!clean || !c->opts.nofsck) { + if (!clean || c->opts.fsck) { ret = bch2_journal_read(c, &journal); if (ret) goto err; @@ -218,6 +218,8 @@ int bch2_fs_recovery(struct bch_fs *c) goto err; bch_verbose(c, "mark and sweep done"); + clear_bit(BCH_FS_REBUILD_REPLICAS, &c->flags); + if (c->opts.noreplay) goto out; |