summaryrefslogtreecommitdiff
path: root/libbcachefs/migrate.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2020-06-03 16:21:35 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2020-06-03 19:56:33 -0400
commit1952c0790c74e4e81d7066a19aabc5c55a13f10f (patch)
tree501fa5db6a5f1fd3b2412a2660e995c74ebf0bba /libbcachefs/migrate.c
parent90d54b388666b258c97be6a4e632824d136356c4 (diff)
Update bcachefs sources to c9b4a210f9 fixup! bcachefs: Fixes for going RO
Diffstat (limited to 'libbcachefs/migrate.c')
-rw-r--r--libbcachefs/migrate.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/libbcachefs/migrate.c b/libbcachefs/migrate.c
index e26fa160..96c8690a 100644
--- a/libbcachefs/migrate.c
+++ b/libbcachefs/migrate.c
@@ -151,15 +151,8 @@ retry:
}
/* flush relevant btree updates */
- while (1) {
- closure_wait_event(&c->btree_interior_update_wait,
- !bch2_btree_interior_updates_nr_pending(c) ||
- c->btree_roots_dirty);
- if (c->btree_roots_dirty)
- bch2_journal_meta(&c->journal);
- if (!bch2_btree_interior_updates_nr_pending(c))
- break;
- }
+ closure_wait_event(&c->btree_interior_update_wait,
+ !bch2_btree_interior_updates_nr_pending(c));
ret = 0;
err: