3 files changed, 37 insertions, 31 deletions

diff --git a/fs/bcachefs/nocow_locking.c b/fs/bcachefs/nocow_locking.c
index 8f06e08370a2..b325fb105322 100644
--- a/fs/bcachefs/nocow_locking.c
+++ b/fs/bcachefs/nocow_locking.c
@@ -10,6 +10,6 @@ void __bch2_bucket_nocow_lock(struct bucket_nocow_lock_table *t,
 	struct bch_fs *c = container_of(t, struct bch_fs, nocow_locks);
 	u64 start_time = local_clock();
 
-	bch2_two_state_lock(l, flags & BUCKET_NOCOW_LOCK_UPDATE);
+	__bch2_two_state_lock(l, flags & BUCKET_NOCOW_LOCK_UPDATE);
 	bch2_time_stats_update(&c->times[BCH_TIME_nocow_lock_contended], start_time);
 }
diff --git a/fs/bcachefs/two_state_shared_lock.c b/fs/bcachefs/two_state_shared_lock.c
index dc508d545de0..9764c2e6a910 100644
--- a/fs/bcachefs/two_state_shared_lock.c
+++ b/fs/bcachefs/two_state_shared_lock.c
@@ -2,32 +2,7 @@
 
 #include "two_state_shared_lock.h"
 
-void bch2_two_state_unlock(two_state_lock_t *lock, int s)
+void __bch2_two_state_lock(two_state_lock_t *lock, int s)
 {
-	long i = s ? 1 : -1;
-
-	BUG_ON(atomic_long_read(&lock->v) == 0);
-
-	if (atomic_long_sub_return_release(i, &lock->v) == 0)
-		wake_up_all(&lock->wait);
-}
-
-bool bch2_two_state_trylock(two_state_lock_t *lock, int s)
-{
-	long i = s ? 1 : -1;
-	long v = atomic_long_read(&lock->v), old;
-
-	do {
-		old = v;
-
-		if (i > 0 ? v < 0 : v > 0)
-			return false;
-	} while ((v = atomic_long_cmpxchg_acquire(&lock->v,
-					old, old + i)) != old);
-	return true;
-}
-
-void bch2_two_state_lock(two_state_lock_t *lock, int s)
-{
-	wait_event(lock->wait, bch2_two_state_trylock(lock, s));
+	__wait_event(lock->wait, bch2_two_state_trylock(lock, s));
 }
diff --git a/fs/bcachefs/two_state_shared_lock.h b/fs/bcachefs/two_state_shared_lock.h
index 1b4f108908a1..905801772002 100644
--- a/fs/bcachefs/two_state_shared_lock.h
+++ b/fs/bcachefs/two_state_shared_lock.h
@@ -6,6 +6,8 @@
 #include <linux/sched.h>
 #include <linux/wait.h>
 
+#include "util.h"
+
 /*
  * Two-state lock - can be taken for add or block - both states are shared,
  * like read side of rwsem, but conflict with other state:
@@ -21,8 +23,37 @@ static inline void two_state_lock_init(two_state_lock_t *lock)
 	init_waitqueue_head(&lock->wait);
 }
 
-void bch2_two_state_unlock(two_state_lock_t *, int);
-bool bch2_two_state_trylock(two_state_lock_t *, int);
-void bch2_two_state_lock(two_state_lock_t *, int);
+static inline void bch2_two_state_unlock(two_state_lock_t *lock, int s)
+{
+	long i = s ? 1 : -1;
+
+	EBUG_ON(atomic_long_read(&lock->v) == 0);
+
+	if (atomic_long_sub_return_release(i, &lock->v) == 0)
+		wake_up_all(&lock->wait);
+}
+
+static inline bool bch2_two_state_trylock(two_state_lock_t *lock, int s)
+{
+	long i = s ? 1 : -1;
+	long v = atomic_long_read(&lock->v), old;
+
+	do {
+		old = v;
+
+		if (i > 0 ? v < 0 : v > 0)
+			return false;
+	} while ((v = atomic_long_cmpxchg_acquire(&lock->v,
+					old, old + i)) != old);
+	return true;
+}
+
+void __bch2_two_state_lock(two_state_lock_t *, int);
+
+static inline void bch2_two_state_lock(two_state_lock_t *lock, int s)
+{
+	if (!bch2_two_state_trylock(lock, s))
+		__bch2_two_state_lock(lock, s);
+}
 
 #endif /* _BCACHEFS_TWO_STATE_LOCK_H */