diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-10-24 17:00:33 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-11-04 12:25:22 -0400 |
| commit | 2ac659a691bf2f16de25e654f24c011311d933b8 (patch) | |
| tree | 544876e45bd259224dbe0835abd29d78f38d4c13 | |
| parent | 74cee91f4a760eb39df16866d69d14c8204fa129 (diff) | |
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 <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/move.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c index 83ee011c5157..fae260097950 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, |