From: Alan Huang <mmpgouride@gmail.com>
Date: Wed, 2 Oct 2024 19:06:33 +0000 (+0800)
Subject: bcachefs: Pop all the transactions from the abort one
X-Git-Tag: v6.14-rc1~204^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dd21b27121985cef0642d0cb89cfd749393b727;p=thirdparty%2Flinux.git

bcachefs: Pop all the transactions from the abort one

The transaction is going to abort, so there will be no cycle involving
this transaction anymore.

Signed-off-by: Alan Huang <mmpgouride@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c
index 15ef9f71ca436..10b805a60f526 100644
--- a/fs/bcachefs/btree_locking.c
+++ b/fs/bcachefs/btree_locking.c
@@ -242,6 +242,8 @@ static noinline int break_cycle(struct lock_graph *g, struct printbuf *cycle,
 out:
 	if (ret)
 		lock_graph_pop_all(g);
+	else
+		lock_graph_pop_from(g, abort);
 	return ret;
 }