Update bcachefs sources to 7bf1ac0d46 bcachefs: Correctly initialize new buckets...

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

diff --git a/libbcachefs/buckets.h b/libbcachefs/buckets.h
index ecbeb7280f87f3cd2f9d3146412ebe8ebdf68da6..bf8d7f407e9cf372c2a5cf4b636e7bddf906e913 100644 (file)
--- a/libbcachefs/buckets.h
+++ b/libbcachefs/buckets.h
@@ -70,12 +70,15 @@ union ulong_byte_assert {
 static inline void bucket_unlock(struct bucket *b)
 {
        BUILD_BUG_ON(!((union ulong_byte_assert) { .ulong = 1UL << BUCKET_LOCK_BITNR }).byte);
-       bit_spin_unlock(BUCKET_LOCK_BITNR, (void *) &b->lock);
+
+       clear_bit_unlock(BUCKET_LOCK_BITNR, (void *) &b->lock);
+       wake_up_bit((void *) &b->lock, BUCKET_LOCK_BITNR);
 }
 
 static inline void bucket_lock(struct bucket *b)
 {
-       bit_spin_lock(BUCKET_LOCK_BITNR, (void *) &b->lock);
+       wait_on_bit_lock((void *) &b->lock, BUCKET_LOCK_BITNR,
+                        TASK_UNINTERRUPTIBLE);
 }
 
 static inline struct bucket_array *gc_bucket_array(struct bch_dev *ca)