diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-23 02:50:33 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-12-27 11:38:32 -0500 |
| commit | d9361b62dc472a9814f85e702805112d88835c9e (patch) | |
| tree | d0e16db3f91e76f3dd472484cd04ed45590eb65a | |
| parent | 13574af7e870ddac4874b609d4020c59775de0ce (diff) | |
Revert "bcachefs: start erasure coding after journal replay"
This reverts commit 36f389604294dfc953e6f5624ceb683818d32f28.
| -rw-r--r-- | fs/bcachefs/recovery.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index dca84300db00..0e3c321a1485 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -213,6 +213,11 @@ int bch2_fs_recovery(struct bch_fs *c) set_bit(BCH_FS_ALLOC_READ_DONE, &c->flags); + err = "cannot allocate memory"; + ret = bch2_fs_ec_start(c); + if (ret) + goto err; + bch_verbose(c, "starting mark and sweep:"); err = "error in recovery"; ret = bch2_initial_gc(c, &journal); @@ -273,11 +278,6 @@ int bch2_fs_recovery(struct bch_fs *c) bch_verbose(c, "quotas done"); } - err = "cannot allocate memory"; - ret = bch2_fs_ec_start(c); - if (ret) - goto err; - out: bch2_journal_entries_free(&journal); kfree(clean); |