diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-23 10:50:33 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:08:12 +0300 |
| commit | 4e65431c855e959700cc9456f305fcfd94ee6241 (patch) | |
| tree | f5d46913e0ebfa6a0b21e5ea0ccb76cf67b77117 /fs/bcachefs/recovery.c | |
| parent | e88973373aaabebba6e59ff0ff74333eacd7bffb (diff) | |
| download | linux-4e65431c855e959700cc9456f305fcfd94ee6241.tar.xz | |
Revert "bcachefs: start erasure coding after journal replay"
This reverts commit 36f389604294dfc953e6f5624ceb683818d32f28.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/recovery.c')
| -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 f00e327d4d35..ddfba16a2998 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -214,6 +214,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); @@ -274,11 +279,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); |