From: Alan Huang <mmpgouride@gmail.com>
Date: Wed, 2 Oct 2024 19:06:30 +0000 (+0800)
Subject: bcachefs: Convert open-coded lock_graph_pop_all to helper
X-Git-Tag: v6.14-rc1~204^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5c3dcd0db0452b13a4799b9c2be751e75b541f9;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Convert open-coded lock_graph_pop_all to helper

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 771d531d6533f..8174799dd4b31 100644
--- a/fs/bcachefs/btree_locking.c
+++ b/fs/bcachefs/btree_locking.c
@@ -229,8 +229,7 @@ static noinline int break_cycle(struct lock_graph *g, struct printbuf *cycle)
 	ret = abort_lock(g, abort);
 out:
 	if (ret)
-		while (g->nr)
-			lock_graph_up(g);
+		lock_graph_pop_all(g);
 	return ret;
 }
 
@@ -252,8 +251,7 @@ static int lock_graph_descend(struct lock_graph *g, struct btree_trans *trans,
 		if (orig_trans->lock_may_not_fail)
 			return 0;
 
-		while (g->nr)
-			lock_graph_up(g);
+		lock_graph_pop_all(g);
 
 		if (cycle)
 			return 0;