Update bcachefs sources to cbb2e45634dd bcachefs: fix simulateously upgrading & downg...

[bcachefs-tools-debian] / libbcachefs / nocow_locking.h

diff --git a/libbcachefs/nocow_locking.h b/libbcachefs/nocow_locking.h
index 09ab85ac0f9fa26d3bc4edb9fcc75796ce38f063..f9d6a426a960c4949902c72f2019bd76bd308676 100644 (file)
--- a/libbcachefs/nocow_locking.h
+++ b/libbcachefs/nocow_locking.h
@@ -2,54 +2,49 @@
 #ifndef _BCACHEFS_NOCOW_LOCKING_H
 #define _BCACHEFS_NOCOW_LOCKING_H
 
-#include "bcachefs_format.h"
-#include "two_state_shared_lock.h"
+#include "bcachefs.h"
+#include "alloc_background.h"
+#include "nocow_locking_types.h"
 
-#include <linux/siphash.h>
+#include <linux/hash.h>
 
-#define BUCKET_NOCOW_LOCKS             (1U << 10)
-
-struct bucket_nocow_lock_table {
-       siphash_key_t                   key;
-       two_state_lock_t                l[BUCKET_NOCOW_LOCKS];
-};
-
-#define BUCKET_NOCOW_LOCK_UPDATE       (1 << 0)
-
-static inline two_state_lock_t *bucket_nocow_lock(struct bucket_nocow_lock_table *t,
-                                                 struct bpos bucket)
+static inline struct nocow_lock_bucket *bucket_nocow_lock(struct bucket_nocow_lock_table *t,
+                                                         u64 dev_bucket)
 {
-       u64 dev_bucket = bucket.inode << 56 | bucket.offset;
-       unsigned h = siphash_1u64(dev_bucket, &t->key);
+       unsigned h = hash_64(dev_bucket, BUCKET_NOCOW_LOCKS_BITS);
 
        return t->l + (h & (BUCKET_NOCOW_LOCKS - 1));
 }
 
-static inline bool bch2_bucket_nocow_is_locked(struct bucket_nocow_lock_table *t,
-                                              struct bpos bucket)
-{
-       two_state_lock_t *l = bucket_nocow_lock(t, bucket);
+#define BUCKET_NOCOW_LOCK_UPDATE       (1 << 0)
 
-       return atomic_long_read(&l->v) != 0;
-}
+bool bch2_bucket_nocow_is_locked(struct bucket_nocow_lock_table *, struct bpos);
+void bch2_bucket_nocow_unlock(struct bucket_nocow_lock_table *, struct bpos, int);
+bool __bch2_bucket_nocow_trylock(struct nocow_lock_bucket *, u64, int);
+void __bch2_bucket_nocow_lock(struct bucket_nocow_lock_table *,
+                             struct nocow_lock_bucket *, u64, int);
 
-static inline void bch2_bucket_nocow_unlock(struct bucket_nocow_lock_table *t,
-                                           struct bpos bucket, int flags)
+static inline void bch2_bucket_nocow_lock(struct bucket_nocow_lock_table *t,
+                                         struct bpos bucket, int flags)
 {
-       two_state_lock_t *l = bucket_nocow_lock(t, bucket);
+       u64 dev_bucket = bucket_to_u64(bucket);
+       struct nocow_lock_bucket *l = bucket_nocow_lock(t, dev_bucket);
 
-       bch2_two_state_unlock(l, flags & BUCKET_NOCOW_LOCK_UPDATE);
+       __bch2_bucket_nocow_lock(t, l, dev_bucket, flags);
 }
 
-void __bch2_bucket_nocow_lock(struct bucket_nocow_lock_table *, struct bpos, int);
-
-static inline void bch2_bucket_nocow_lock(struct bucket_nocow_lock_table *t,
+static inline bool bch2_bucket_nocow_trylock(struct bucket_nocow_lock_table *t,
                                          struct bpos bucket, int flags)
 {
-       two_state_lock_t *l = bucket_nocow_lock(t, bucket);
+       u64 dev_bucket = bucket_to_u64(bucket);
+       struct nocow_lock_bucket *l = bucket_nocow_lock(t, dev_bucket);
 
-       if (!bch2_two_state_trylock(l, flags & BUCKET_NOCOW_LOCK_UPDATE))
-               __bch2_bucket_nocow_lock(t, bucket, flags);
+       return __bch2_bucket_nocow_trylock(l, dev_bucket, flags);
 }
 
+void bch2_nocow_locks_to_text(struct printbuf *, struct bucket_nocow_lock_table *);
+
+void bch2_fs_nocow_locking_exit(struct bch_fs *);
+int bch2_fs_nocow_locking_init(struct bch_fs *);
+
 #endif /* _BCACHEFS_NOCOW_LOCKING_H */