summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2022-09-22 17:06:44 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2022-09-22 17:06:44 -0400
commit659563c3e745b56009638d2cab11243f65e69553 (patch)
treea653862d11cece58dadbd552bee48f966642d15e
parent4fb76991f7742ead11ab1d8e0bb7542f08d1bbed (diff)
fixup! bcachefs: Print deadlock cycle in debugfs
-rw-r--r--fs/bcachefs/btree_locking.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c
index 0a3090f8a633..a8a1976b39fd 100644
--- a/fs/bcachefs/btree_locking.c
+++ b/fs/bcachefs/btree_locking.c
@@ -135,13 +135,14 @@ static int lock_graph_descend(struct lock_graph *g, struct btree_trans *trans,
}
if (i->trans == trans) {
- /* Only checking: */
if (cycle) {
+ /* Only checking: */
print_cycle(cycle, g);
- return 1;
+ ret = -1;
+ } else {
+ ret = break_cycle(g);
}
- ret = break_cycle(g);
goto deadlock;
}
}