diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-11-20 13:24:51 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-12-07 11:47:04 -0500 |
| commit | 33f175f0cd3a94b7c05031f0249dff7114bb292c (patch) | |
| tree | 60fee8d401d3e55e9f451ca696d8965065046134 | |
| parent | 8887d6465908fe62f22065bef52cf29b28160935 (diff) | |
bcachefs: Simplify transaction commit error path
The transaction restart path traverses all iterators, we don't need to
do it here.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/btree_update_leaf.c | 11 | ||||
| -rw-r--r-- | include/trace/events/bcachefs.h | 5 |
2 files changed, 0 insertions, 16 deletions
diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index a2ca31e75a7e..c921091c71a4 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -647,17 +647,6 @@ int bch2_trans_commit_error(struct btree_trans *trans, break; } - if (ret == -EINTR) { - int ret2 = bch2_btree_iter_traverse_all(trans); - - if (ret2) { - trace_trans_restart_traverse(trans->ip); - return ret2; - } - - trace_trans_restart_atomic(trans->ip); - } - return ret; } diff --git a/include/trace/events/bcachefs.h b/include/trace/events/bcachefs.h index e62c428ca86e..fbc463849db6 100644 --- a/include/trace/events/bcachefs.h +++ b/include/trace/events/bcachefs.h @@ -716,11 +716,6 @@ DEFINE_EVENT(transaction_restart, trans_restart_traverse, TP_ARGS(ip) ); -DEFINE_EVENT(transaction_restart, trans_restart_atomic, - TP_PROTO(unsigned long ip), - TP_ARGS(ip) -); - DECLARE_EVENT_CLASS(node_lock_fail, TP_PROTO(unsigned level, u32 iter_seq, unsigned node, u32 node_seq), TP_ARGS(level, iter_seq, node, node_seq), |