Skip to content

Commit f548db4

Browse files
author
Kent Overstreet
committed
bcachefs: Silence errors after emergency shutdown
We don't care about errors from asynchronous ops that were because we did an emergency shutdown; silence them. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
1 parent 458e2ef commit f548db4

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

fs/bcachefs/btree_update_interior.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,8 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path,
12681268
bch2_btree_update_free(as, trans);
12691269
if (!bch2_err_matches(ret, ENOSPC) &&
12701270
!bch2_err_matches(ret, EROFS) &&
1271-
ret != -BCH_ERR_journal_reclaim_would_deadlock)
1271+
ret != -BCH_ERR_journal_reclaim_would_deadlock &&
1272+
ret != -BCH_ERR_journal_shutdown)
12721273
bch_err_fn_ratelimited(c, ret);
12731274
return ERR_PTR(ret);
12741275
}
@@ -2302,7 +2303,9 @@ static void async_btree_node_rewrite_work(struct work_struct *work)
23022303

23032304
int ret = bch2_trans_do(c, bch2_btree_node_rewrite_key(trans,
23042305
a->btree_id, a->level, a->key.k, 0));
2305-
if (ret != -ENOENT)
2306+
if (ret != -ENOENT &&
2307+
!bch2_err_matches(ret, EROFS) &&
2308+
ret != -BCH_ERR_journal_shutdown)
23062309
bch_err_fn_ratelimited(c, ret);
23072310

23082311
spin_lock(&c->btree_node_rewrites_lock);

fs/bcachefs/journal_io.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1623,7 +1623,8 @@ static CLOSURE_CALLBACK(journal_write_done)
16231623
: j->noflush_write_time, j->write_start_time);
16241624

16251625
if (!w->devs_written.nr) {
1626-
bch_err(c, "unable to write journal to sufficient devices");
1626+
if (!bch2_journal_error(j))
1627+
bch_err(c, "unable to write journal to sufficient devices");
16271628
err = -BCH_ERR_journal_write_err;
16281629
} else {
16291630
bch2_devlist_to_replicas(&replicas.e, BCH_DATA_journal,

0 commit comments

Comments
 (0)