diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-10-19 15:11:45 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-12 20:13:27 -0500 |
| commit | 34d7dcf54270d9d4e50af6a5912085c32f723a57 (patch) | |
| tree | beeca8d9e9f9c05f8cc62ae72022583ce9ffad1f | |
| parent | a5a149bfc3a01637bc2d5ed7a1f1664684e18386 (diff) | |
bcachefs: Handle transaction restarts in bch2_blacklist_entries_gc()
It shouldn't be necessary when we're only using a single iterator and
not doing updates, but that's harder to debug at the moment.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/journal_seq_blacklist.c | 21 | ||||
| -rw-r--r-- | fs/bcachefs/migrate.c | 1 | ||||
| -rw-r--r-- | fs/bcachefs/move.c | 1 |
3 files changed, 17 insertions, 6 deletions
diff --git a/fs/bcachefs/journal_seq_blacklist.c b/fs/bcachefs/journal_seq_blacklist.c index f84a63ac15af..79bc0e49389b 100644 --- a/fs/bcachefs/journal_seq_blacklist.c +++ b/fs/bcachefs/journal_seq_blacklist.c @@ -253,12 +253,21 @@ void bch2_blacklist_entries_gc(struct work_struct *work) struct btree_iter iter; struct btree *b; - for_each_btree_node(&trans, iter, i, POS_MIN, - BTREE_ITER_PREFETCH, b, ret) - if (test_bit(BCH_FS_STOPPING, &c->flags)) { - bch2_trans_exit(&trans); - return; - } + bch2_trans_node_iter_init(&trans, &iter, i, POS_MIN, + 0, 0, BTREE_ITER_PREFETCH); +retry: + bch2_trans_begin(&trans); + + b = bch2_btree_iter_peek_node(&iter); + + while (!(ret = PTR_ERR_OR_ZERO(b)) && + b && + !test_bit(BCH_FS_STOPPING, &c->flags)) + b = bch2_btree_iter_next_node(&iter); + + if (ret == -EINTR) + goto retry; + bch2_trans_iter_exit(&trans, &iter); } diff --git a/fs/bcachefs/migrate.c b/fs/bcachefs/migrate.c index 00ba6e1c92ee..6defc33322b3 100644 --- a/fs/bcachefs/migrate.c +++ b/fs/bcachefs/migrate.c @@ -136,6 +136,7 @@ static int bch2_dev_metadata_drop(struct bch_fs *c, unsigned dev_idx, int flags) bch2_trans_node_iter_init(&trans, &iter, id, POS_MIN, 0, 0, BTREE_ITER_PREFETCH); retry: + ret = 0; while (bch2_trans_begin(&trans), (b = bch2_btree_iter_peek_node(&iter)) && !(ret = PTR_ERR_OR_ZERO(b))) { diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c index 8f1536882091..20396820bbb3 100644 --- a/fs/bcachefs/move.c +++ b/fs/bcachefs/move.c @@ -886,6 +886,7 @@ static int bch2_move_btree(struct bch_fs *c, bch2_trans_node_iter_init(&trans, &iter, id, POS_MIN, 0, 0, BTREE_ITER_PREFETCH); retry: + ret = 0; while (bch2_trans_begin(&trans), (b = bch2_btree_iter_peek_node(&iter)) && !(ret = PTR_ERR_OR_ZERO(b))) { |