From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Wed, 10 Aug 2022 16:34:18 +0000 (-0400)
Subject: bcachefs: six_lock_counts() is now in six.c
X-Git-Tag: v6.7-rc1~201^2~846
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa3ae3ca4e13d86fe5f97c275748b3820c873091;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: six_lock_counts() is now in six.c

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

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 479e46a26f460..2c24faca623a7 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -131,7 +131,7 @@ void bch2_btree_node_unlock_write(struct btree_trans *trans,
 	bch2_btree_node_unlock_write_inlined(trans, path, b);
 }
 
-static struct six_lock_count btree_node_lock_counts(struct btree_trans *trans,
+struct six_lock_count bch2_btree_node_lock_counts(struct btree_trans *trans,
 					   struct btree_path *skip,
 					   struct btree *b,
 					   unsigned level)
@@ -161,7 +161,7 @@ static inline void six_lock_readers_add(struct six_lock *lock, int nr)
 
 void __bch2_btree_node_lock_write(struct btree_trans *trans, struct btree *b)
 {
-	int readers = btree_node_lock_counts(trans, NULL, b, b->c.level).read;
+	int readers = bch2_btree_node_lock_counts(trans, NULL, b, b->c.level).read;
 
 	/*
 	 * Must drop our read locks before calling six_lock_write() -
@@ -244,7 +244,7 @@ bool bch2_btree_node_upgrade(struct btree_trans *trans,
 				     path->btree_id,
 				     &path->pos,
 				     btree_node_locked(path, level),
-				     btree_node_lock_counts(trans, NULL, b, level),
+				     bch2_btree_node_lock_counts(trans, NULL, b, level),
 				     six_lock_counts(&b->c.lock));
 	return false;
 success:
diff --git a/fs/bcachefs/trace.c b/fs/bcachefs/trace.c
index b770973faa14b..eff1e3dfbceac 100644
--- a/fs/bcachefs/trace.c
+++ b/fs/bcachefs/trace.c
@@ -4,9 +4,9 @@
 #include "buckets.h"
 #include "btree_types.h"
 #include "keylist.h"
+#include "six.h"
 
 #include <linux/blktrace_api.h>
-#include "keylist.h"
 
 #define CREATE_TRACE_POINTS
 #include "trace.h"