bcachefs: Kill JOURNAL_ERRORS()
PATCH 1/1 bcachefs: Kill JOURNAL_ERRORS()
Convert these to standard error codes, which means we can pass them outside the journal code, they're easier to pass to tracepoints, etc.
Signed-off-by Kent Overstreet <[email protected]>
--- fs/bcachefs/btree_trans_commit.c | 30 +++++++------- fs/bcachefs/errcode.h | 16 ++++++-- fs/bcachefs/journal.c | 69 ++++++++++++++------------------ fs/bcachefs/journal_reclaim.c | 4 +- fs/bcachefs/journal_types.h | 21 +--------- 5 files changed, 62 insertions(+), 78 deletions(-)
fs/bcachefs/btree_trans_commit.c +16 -14
@@ -880,18 +880,7 @@ int bch2_trans_commit_error(struct btree_trans *trans, unsigned flags,struct bch_fs *c = trans->c;enum bch_watermark watermark = flags &BCH_WATERMARK_MASK ; -switch (ret) { -case -BCH_ERR_btree_insert_btree_node_full: - ret =bch2_btree_split_leaf (trans, i->path, flags); -if (bch2_err_matches (ret, BCH_ERR_transaction_restart)) -trace_and_count (c, trans_restart_btree_node_split, trans, - trace_ip, trans->paths + i->path); -break ; -case -BCH_ERR_btree_insert_need_mark_replicas: - ret =drop_locks_do (trans, -bch2_accounting_update_sb (trans)); -break ; -case -BCH_ERR_journal_res_get_blocked: +if (bch2_err_matches (ret, BCH_ERR_journal_res_blocked)) {/* * XXX: this should probably be a separate BTREE_INSERT_NONBLOCK * flag
@@ -899,13 +888,26 @@ int bch2_trans_commit_error(struct btree_trans *trans, unsigned flags,if ((flags & BCH_TRANS_COMMIT_journal_reclaim) && watermark < BCH_WATERMARK_reclaim) { ret = -BCH_ERR_journal_reclaim_would_deadlock; -break ; + goto out; } ret =drop_locks_do (trans,bch2_trans_journal_res_get (trans, (flags &BCH_WATERMARK_MASK )|JOURNAL_RES_GET_CHECK )); + goto out; + } + +switch (ret) { +case -BCH_ERR_btree_insert_btree_node_full: + ret =bch2_btree_split_leaf (trans, i->path, flags); +if (bch2_err_matches (ret, BCH_ERR_transaction_restart)) +trace_and_count (c, trans_restart_btree_node_split, trans, + trace_ip, trans->paths + i->path); +break ; +case -BCH_ERR_btree_insert_need_mark_replicas: + ret =drop_locks_do (trans, +bch2_accounting_update_sb (trans));break ;case -BCH_ERR_btree_insert_need_journal_reclaim:bch2_trans_unlock (trans);
@@ -927,7 +929,7 @@ int bch2_trans_commit_error(struct btree_trans *trans, unsigned flags,BUG_ON (ret >=0 );break ; } - +out:BUG_ON (bch2_err_matches (ret, BCH_ERR_transaction_restart) != !!trans->restarted); bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOSPC) &&
fs/bcachefs/errcode.h +12 -4
@@ -218,10 +218,18 @@ x(EROFS, insufficient_devices) \ x(0, operation_blocked) \ x(BCH_ERR_operation_blocked, btree_cache_cannibalize_lock_blocked) \ - x(BCH_ERR_operation_blocked, journal_res_get_blocked) \ - x(BCH_ERR_operation_blocked, journal_preres_get_blocked) \ - x(BCH_ERR_operation_blocked, bucket_alloc_blocked) \ - x(BCH_ERR_operation_blocked, stripe_alloc_blocked) \ + x(BCH_ERR_operation_blocked, journal_res_blocked) \ + x(BCH_ERR_journal_res_blocked, journal_blocked) \ + x(BCH_ERR_journal_res_blocked, journal_max_in_flight) \ + x(BCH_ERR_journal_res_blocked, journal_max_open) \ + x(BCH_ERR_journal_res_blocked, journal_full) \ + x(BCH_ERR_journal_res_blocked, journal_pin_full) \ + x(BCH_ERR_journal_res_blocked, journal_buf_enomem) \ + x(BCH_ERR_journal_res_blocked, journal_stuck) \ + x(BCH_ERR_journal_res_blocked, journal_retry_open) \ + x(BCH_ERR_journal_res_blocked, journal_preres_get_blocked) \ + x(BCH_ERR_journal_res_blocked, bucket_alloc_blocked) \ + x(BCH_ERR_journal_res_blocked, stripe_alloc_blocked) \ x(BCH_ERR_invalid, invalid_sb) \ x(BCH_ERR_invalid_sb, invalid_sb_magic) \x (BCH_ERR_invalid_sb, invalid_sb_version) \
fs/bcachefs/journal.c +31 -38
190 lines not on this page · raw message
fs/bcachefs/journal_reclaim.c +2 -2
@@ -226,7 +226,7 @@ void bch2_journal_space_available(struct journal *j)bch_err (c,"%s" , buf.buf);printbuf_exit (&buf); - ret = JOURNAL_ERR_insufficient_devices; + ret = -BCH_ERR_insufficient_journal_devices; goto out; }
@@ -240,7 +240,7 @@ void bch2_journal_space_available(struct journal *j) total = j->space[journal_space_total].total;if (!j->space[journal_space_discarded].next_entry) - ret = JOURNAL_ERR_journal_full; + ret = -BCH_ERR_journal_full; if ((j->space[journal_space_clean_ondisk].next_entry < j->space[journal_space_clean_ondisk].total) &&
fs/bcachefs/journal_types.h +1 -20
@@ -151,25 +151,6 @@ enum journal_flags {#undef x }; -/* Reasons we may fail to get a journal reservation: */ -#define JOURNAL_ERRORS () \ - x(ok) \ - x(retry) \ - x(blocked) \ - x(max_in_flight) \ - x(max_open) \ - x(journal_full) \ - x(journal_pin_full) \ - x(journal_stuck) \ - x(enomem) \ - x(insufficient_devices) - -enum journal_errors { -#define x(n) JOURNAL_ERR_##n, - JOURNAL_ERRORS() -#undef x -}; -typedef DARRAY (u64)darray_u64 ;struct journal_bio {
@@ -204,7 +185,7 @@ struct journal {* 0, or -ENOSPC if waiting on journal reclaim, or -EROFS if * insufficient devices: */ -enum journal_errors cur_entry_error; +int cur_entry_error;unsigned cur_entry_offset_if_blocked;unsigned buf_size_want;
Signature · 1 line
2.49.0