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>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index 4ab12a9db2f4ad752f9edbf481323e8b1abaa593..08d08d2f1ea3c38f612da60147f5372879b04a7b 100644 (file)
--- 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 2afc09ad64ea8690b4b38a55dff230288a6ebf59..9706b6a3b1b2ed043f1ddf0838a129f187a63a74 100644 (file)
--- 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),