From 74148a8ee52526c44752f1773365963f18734ac9 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 21 Mar 2022 02:10:28 -0400 Subject: Update bcachefs sources to 0e705f5944 fixup! bcachefs: Refactor bch2_btree_node_mem_alloc() --- libbcachefs/move.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libbcachefs/move.c') diff --git a/libbcachefs/move.c b/libbcachefs/move.c index 16bca144..8eb49381 100644 --- a/libbcachefs/move.c +++ b/libbcachefs/move.c @@ -351,8 +351,7 @@ 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; + m->op.alloc_reserve = RESERVE_movinggc; } else { /* XXX: this should probably be passed in */ m->op.flags |= BCH_WRITE_ONLY_SPECIFIED_DEVS; -- cgit v1.2.3