six locks: six_lock_readers_add()

This moves a helper out of the bcachefs code that shouldn't have been
there, since it touches six lock internals.

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

diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c
index 9e097ab668a6dccfed831a6c6b9d1d4767999033..d7b0c4436caf63169a14e737d6389bc021a6ad6a 100644 (file)
--- a/fs/bcachefs/btree_locking.c
+++ b/fs/bcachefs/btree_locking.c
@@ -24,16 +24,6 @@ void bch2_assert_btree_nodes_not_locked(void)
 
 /* Btree node locking: */
 
-static inline void six_lock_readers_add(struct six_lock *lock, int nr)
-{
-       if (lock->readers)
-               this_cpu_add(*lock->readers, nr);
-       else if (nr > 0)
-               atomic64_add(__SIX_VAL(read_lock, nr), &lock->state.counter);
-       else
-               atomic64_sub(__SIX_VAL(read_lock, -nr), &lock->state.counter);
-}
-
 struct six_lock_count bch2_btree_node_lock_counts(struct btree_trans *trans,
                                                  struct btree_path *skip,
                                                  struct btree_bkey_cached_common *b,

diff --git a/fs/bcachefs/six.c b/fs/bcachefs/six.c
index b54a2ac480c8ed4793d54b648456c93618ff3849..0f9e1bf31008f7a80ae085396ea317e79bb2d6aa 100644 (file)
--- a/fs/bcachefs/six.c
+++ b/fs/bcachefs/six.c
@@ -40,6 +40,8 @@ struct six_lock_vals {
        enum six_lock_type      unlock_wakeup;
 };
 
+#define __SIX_VAL(field, _v)   (((union six_lock_state) { .field = _v }).v)
+
 #define __SIX_LOCK_HELD_read   __SIX_VAL(read_lock, ~0)
 #define __SIX_LOCK_HELD_intent __SIX_VAL(intent_lock, ~0)
 #define __SIX_LOCK_HELD_write  __SIX_VAL(seq, 1)
@@ -847,3 +849,14 @@ struct six_lock_count six_lock_counts(struct six_lock *lock)
        return ret;
 }
 EXPORT_SYMBOL_GPL(six_lock_counts);
+
+void six_lock_readers_add(struct six_lock *lock, int nr)
+{
+       if (lock->readers)
+               this_cpu_add(*lock->readers, nr);
+       else if (nr > 0)
+               atomic64_add(__SIX_VAL(read_lock, nr), &lock->state.counter);
+       else
+               atomic64_sub(__SIX_VAL(read_lock, -nr), &lock->state.counter);
+}
+EXPORT_SYMBOL_GPL(six_lock_readers_add);

diff --git a/fs/bcachefs/six.h b/fs/bcachefs/six.h
index 09abea29a0211af0a00912c8d3e6d70f3c973c4f..6b53818ae97a13d27d2b27c44f5a2b2925646825 100644 (file)
--- a/fs/bcachefs/six.h
+++ b/fs/bcachefs/six.h
@@ -152,8 +152,6 @@ do {                                                                        \
        __six_lock_init((lock), #lock, &__key);                         \
 } while (0)
 
-#define __SIX_VAL(field, _v)   (((union six_lock_state) { .field = _v }).v)
-
 #define __SIX_LOCK(type)                                               \
 bool six_trylock_ip_##type(struct six_lock *, unsigned long);          \
 bool six_relock_ip_##type(struct six_lock *, u32, unsigned long);      \
@@ -258,5 +256,6 @@ struct six_lock_count {
 };
 
 struct six_lock_count six_lock_counts(struct six_lock *);
+void six_lock_readers_add(struct six_lock *, int);
 
 #endif /* _LINUX_SIX_H */