From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Fri, 23 Nov 2018 07:50:33 +0000 (-0500)
Subject: Revert "bcachefs: start erasure coding after journal replay"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4e65431c855e959700cc9456f305fcfd94ee6241;p=linux.git

Revert "bcachefs: start erasure coding after journal replay"

This reverts commit 36f389604294dfc953e6f5624ceb683818d32f28.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index f00e327d4d35f..ddfba16a29985 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);