Update bcachefs sources to 3856459b1b bcachefs: bch2_btree_iter_peek_node_and_restart()

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

diff --git a/libbcachefs/bcachefs.h b/libbcachefs/bcachefs.h
index b10e39d8c4a20017a3fc013af3f822438dd3345f..25a32fd6c8f2a594b7fca3cd8dc0eaba4d003a8f 100644 (file)
--- a/libbcachefs/bcachefs.h
+++ b/libbcachefs/bcachefs.h
@@ -516,9 +516,6 @@ struct bch_dev {
        unsigned                nr_open_buckets;
        unsigned                nr_btree_reserve;
 
-       open_bucket_idx_t       open_buckets_partial[OPEN_BUCKETS_COUNT];
-       open_bucket_idx_t       open_buckets_partial_nr;
-
        size_t                  inc_gen_needs_gc;
        size_t                  inc_gen_really_needs_gc;
        size_t                  buckets_waiting_on_journal;
@@ -859,6 +856,9 @@ struct bch_fs {
        struct open_bucket      open_buckets[OPEN_BUCKETS_COUNT];
        open_bucket_idx_t       open_buckets_hash[OPEN_BUCKETS_COUNT];
 
+       open_bucket_idx_t       open_buckets_partial[OPEN_BUCKETS_COUNT];
+       open_bucket_idx_t       open_buckets_partial_nr;
+
        struct write_point      btree_write_point;
        struct write_point      rebalance_write_point;
 
@@ -940,8 +940,11 @@ struct bch_fs {
        GENRADIX(struct stripe) stripes;
        GENRADIX(struct gc_stripe) gc_stripes;
 
+       struct hlist_head       ec_stripes_new[32];
+       spinlock_t              ec_stripes_new_lock;
+
        ec_stripes_heap         ec_stripes_heap;
-       spinlock_t              ec_stripes_heap_lock;
+       struct mutex            ec_stripes_heap_lock;
 
        /* ERASURE CODING */
        struct list_head        ec_stripe_head_list;
@@ -1120,4 +1123,7 @@ static inline bool bch2_dev_exists2(const struct bch_fs *c, unsigned dev)
        return dev < c->sb.nr_devices && c->devs[dev];
 }
 
+#define BKEY_PADDED_ONSTACK(key, pad)                          \
+       struct { struct bkey_i key; __u64 key ## _pad[pad]; }
+
 #endif /* _BCACHEFS_H */