diff options
| -rw-r--r-- | fs/bcachefs/btree_gc.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/fsck.c | 7 | ||||
| -rw-r--r-- | fs/bcachefs/journal.c | 3 | ||||
| -rw-r--r-- | fs/bcachefs/journal_io.c | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c index f094606722a3..e95bb6849aef 100644 --- a/fs/bcachefs/btree_gc.c +++ b/fs/bcachefs/btree_gc.c @@ -387,7 +387,7 @@ again: ret = lockrestart_do(trans, btree_check_node_boundaries(trans, b, prev, cur, pulled_from_scan)); - if (ret < 0) + if (ret && !bch2_err_matches(ret, BCH_ERR_topology_repair)) goto err; if (bch2_err_matches(ret, BCH_ERR_topology_repair_did_fill_from_scan)) { diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c index df0aa2522b18..183b88bbd402 100644 --- a/fs/bcachefs/fsck.c +++ b/fs/bcachefs/fsck.c @@ -1975,6 +1975,10 @@ static int check_extent(struct btree_trans *trans, struct btree_iter *iter, } } + ret = check_extent_overbig(trans, iter, k); + if (ret) + goto err; + ret = bch2_trans_commit(trans, res, NULL, BCH_TRANS_COMMIT_no_enospc); if (ret) goto err; @@ -2021,8 +2025,7 @@ int bch2_check_extents(struct bch_fs *c) POS(BCACHEFS_ROOT_INO, 0), BTREE_ITER_prefetch|BTREE_ITER_all_snapshots, k, ({ bch2_disk_reservation_put(c, &res); - check_extent(trans, &iter, k, &w, &s, &extent_ends, &res) ?: - check_extent_overbig(trans, &iter, k); + check_extent(trans, &iter, k, &w, &s, &extent_ends, &res); })) ?: check_i_sectors_notnested(trans, &w); diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c index 376c9b3b20fe..97760e89e5a3 100644 --- a/fs/bcachefs/journal.c +++ b/fs/bcachefs/journal.c @@ -198,7 +198,8 @@ void bch2_journal_do_writes(struct journal *j) if (!journal_state_seq_count(j, j->reservations, seq)) { j->seq_write_started = seq; w->write_started = true; - closure_call(&w->io, bch2_journal_write, j->wq, &c->cl); + closure_get(&c->cl); + closure_call(&w->io, bch2_journal_write, j->wq, NULL); } break; diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c index bb4a1a7e48e5..47224666d07e 100644 --- a/fs/bcachefs/journal_io.c +++ b/fs/bcachefs/journal_io.c @@ -1821,7 +1821,7 @@ static CLOSURE_CALLBACK(journal_write_done) if (do_discards) bch2_do_discards(c); - closure_return(cl); + closure_put(&c->cl); } static void journal_write_endio(struct bio *bio) |