From: Kent Overstreet Date: Fri, 20 Nov 2020 18:24:51 +0000 (-0500) Subject: bcachefs: Simplify transaction commit error path X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b3c2a06b7d89eb06454f31c4b396e37fbe59374c;p=linux.git 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 Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index 4ab12a9db2f4a..08d08d2f1ea3c 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -657,17 +657,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/fs/bcachefs/trace.h b/fs/bcachefs/trace.h index 2afc09ad64ea8..9706b6a3b1b2e 100644 --- a/fs/bcachefs/trace.h +++ b/fs/bcachefs/trace.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),