bcachefs: Improve btree_reserve_get_fail tracepoint

Now we include the return code.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index d2e785b9c835e799b2a7c2625ab9fd3d784a0d36..566838317845c2e40165e5656268fb5f12e62bf2 100644 (file)
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -1167,7 +1167,8 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path,
        }
 
        if (ret) {
-               trace_and_count(c, btree_reserve_get_fail, trans->fn, _RET_IP_, nr_nodes[0] + nr_nodes[1]);
+               trace_and_count(c, btree_reserve_get_fail, trans->fn,
+                               _RET_IP_, nr_nodes[0] + nr_nodes[1], ret);
                goto err;
        }
 

diff --git a/fs/bcachefs/trace.h b/fs/bcachefs/trace.h
index 7004da8d341fd5fbee5efc7b8525a28f9efec50f..17fc58e737027f6588e700612a19fc35d8005d35 100644 (file)
--- a/fs/bcachefs/trace.h
+++ b/fs/bcachefs/trace.h
@@ -344,25 +344,29 @@ DEFINE_EVENT(btree_node, btree_node_free,
 TRACE_EVENT(btree_reserve_get_fail,
        TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip,
-                size_t required),
-       TP_ARGS(trans_fn, caller_ip, required),
+                size_t required,
+                int ret),
+       TP_ARGS(trans_fn, caller_ip, required, ret),
 
        TP_STRUCT__entry(
                __array(char,                   trans_fn, 32    )
                __field(unsigned long,          caller_ip       )
                __field(size_t,                 required        )
+               __array(char,                   ret, 32         )
        ),
 
        TP_fast_assign(
                strscpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
                __entry->caller_ip      = caller_ip;
                __entry->required       = required;
+               strscpy(__entry->ret, bch2_err_str(ret), sizeof(__entry->ret));
        ),
 
-       TP_printk("%s %pS required %zu",
+       TP_printk("%s %pS required %zu ret %s",
                  __entry->trans_fn,
                  (void *) __entry->caller_ip,
-                 __entry->required)
+                 __entry->required,
+                 __entry->ret)
 );
 
 DEFINE_EVENT(btree_node, btree_node_compact,