From b5c3dcd0db0452b13a4799b9c2be751e75b541f9 Mon Sep 17 00:00:00 2001 From: Alan Huang Date: Thu, 3 Oct 2024 03:06:30 +0800 Subject: [PATCH] bcachefs: Convert open-coded lock_graph_pop_all to helper Signed-off-by: Alan Huang Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_locking.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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; -- 2.39.5