From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Tue, 15 Mar 2022 20:40:55 +0000 (-0400)
Subject: bcachefs: Copygc allocations shouldn't be nowait
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d905f67ec89fda758bcfa70d0b5c3d3006bbdb3e;p=linux.git

bcachefs: Copygc allocations shouldn't be nowait

We don't actually want copygc allocations to be nowait - an allocation
for copygc might fail and then later succeed due to a bucket needing to
wait on journal commit, or to be discarded.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
---

diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index 3a5c81f3697ba..a219c10a71357 100644
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -352,7 +352,6 @@ int bch2_migrate_write_init(struct bch_fs *c, struct migrate_write *m,
 
 	if (m->data_opts.btree_insert_flags & BTREE_INSERT_USE_RESERVE) {
 		m->op.alloc_reserve = RESERVE_movinggc;
-		m->op.flags |= BCH_WRITE_ALLOC_NOWAIT;
 	} else {
 		/* XXX: this should probably be passed in */
 		m->op.flags |= BCH_WRITE_ONLY_SPECIFIED_DEVS;