From: Kent Overstreet Date: Sun, 24 Oct 2021 21:00:33 +0000 (-0400) Subject: bcachefs: Ensure we flush btree updates in evacuate path X-Git-Tag: v6.7-rc1~201^2~1334 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23af498cc44bc7615f3f208f39daab637bcac023;p=thirdparty%2Fkernel%2Flinux.git bcachefs: Ensure we flush btree updates in evacuate path This fixes a possible race where we fail to remove a device because of btree nodes still on it, that are being deleted by in flight btree updates. Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c index 1d7b8696af017..5f50b66fe2063 100644 --- a/fs/bcachefs/move.c +++ b/fs/bcachefs/move.c @@ -932,6 +932,10 @@ next: if (ret) bch_err(c, "error %i in bch2_move_btree", ret); + /* flush relevant btree updates */ + closure_wait_event(&c->btree_interior_update_wait, + !bch2_btree_interior_updates_nr_pending(c)); + progress_list_del(c, stats); return ret; } @@ -1075,10 +1079,6 @@ int bch2_data_job(struct bch_fs *c, op.start_btree, op.start_pos, op.end_btree, op.end_pos, rereplicate_btree_pred, c, stats) ?: ret; - - closure_wait_event(&c->btree_interior_update_wait, - !bch2_btree_interior_updates_nr_pending(c)); - ret = bch2_replicas_gc2(c) ?: ret; ret = bch2_move_data(c,