Commit b3c2a06b authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet

bcachefs: Simplify transaction commit error path

The transaction restart path traverses all iterators, we don't need to
do it here.
Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 8a92e545
...@@ -657,17 +657,6 @@ int bch2_trans_commit_error(struct btree_trans *trans, ...@@ -657,17 +657,6 @@ int bch2_trans_commit_error(struct btree_trans *trans,
break; 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; return ret;
} }
......
...@@ -716,11 +716,6 @@ DEFINE_EVENT(transaction_restart, trans_restart_traverse, ...@@ -716,11 +716,6 @@ DEFINE_EVENT(transaction_restart, trans_restart_traverse,
TP_ARGS(ip) TP_ARGS(ip)
); );
DEFINE_EVENT(transaction_restart, trans_restart_atomic,
TP_PROTO(unsigned long ip),
TP_ARGS(ip)
);
DECLARE_EVENT_CLASS(node_lock_fail, DECLARE_EVENT_CLASS(node_lock_fail,
TP_PROTO(unsigned level, u32 iter_seq, unsigned node, u32 node_seq), TP_PROTO(unsigned level, u32 iter_seq, unsigned node, u32 node_seq),
TP_ARGS(level, iter_seq, node, node_seq), TP_ARGS(level, iter_seq, node, node_seq),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment