From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Fri, 16 May 2025 21:21:00 +0000 (-0400)
Subject: bcachefs: relock_fail tracepoint now includes btree
X-Git-Tag: v6.16-rc1~211^2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a6fa52e07bc8d2e5535e1e2c64b621d34fef9c7;p=thirdparty%2Flinux.git

bcachefs: relock_fail tracepoint now includes btree

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

diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c
index a45cfae8f6718..6663e186a9603 100644
--- a/fs/bcachefs/btree_locking.c
+++ b/fs/bcachefs/btree_locking.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 
 #include "bcachefs.h"
+#include "btree_cache.h"
 #include "btree_locking.h"
 #include "btree_types.h"
 
@@ -742,7 +743,9 @@ static noinline __cold int bch2_trans_relock_fail(struct btree_trans *trans, str
 		struct printbuf buf = PRINTBUF;
 
 		bch2_bpos_to_text(&buf, path->pos);
-		prt_printf(&buf, " l=%u seq=%u node seq=", f->l, path->l[f->l].lock_seq);
+		prt_printf(&buf, " %s l=%u seq=%u node seq=",
+			   bch2_btree_id_str(path->btree_id),
+			   f->l, path->l[f->l].lock_seq);
 		if (IS_ERR_OR_NULL(f->b)) {
 			prt_str(&buf, bch2_err_str(PTR_ERR(f->b)));
 		} else {