Update bcachefs sources to 6a3927a96b fixup! bcachefs: Don't use write side of mark_l...

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

diff --git a/libbcachefs/btree_cache.h b/libbcachefs/btree_cache.h
index 0eeca0bcc48ead34e563794f8a4bd1890faa8752..4791c3b64452d915486a2a5754210fcc1098f0ab 100644 (file)
--- a/libbcachefs/btree_cache.h
+++ b/libbcachefs/btree_cache.h
@@ -7,8 +7,6 @@
 
 struct btree_iter;
 
-extern const char * const bch2_btree_ids[];
-
 void bch2_recalc_btree_reserve(struct bch_fs *);
 
 void bch2_btree_node_hash_remove(struct btree_cache *, struct btree *);
@@ -26,10 +24,7 @@ struct btree *bch2_btree_node_get(struct bch_fs *, struct btree_iter *,
                                  enum six_lock_type, unsigned long);
 
 struct btree *bch2_btree_node_get_noiter(struct bch_fs *, const struct bkey_i *,
-                                        enum btree_id, unsigned);
-
-struct btree *bch2_btree_node_get_sibling(struct bch_fs *, struct btree_iter *,
-                               struct btree *, enum btree_node_sibling);
+                                        enum btree_id, unsigned, bool);
 
 void bch2_btree_node_prefetch(struct bch_fs *, struct btree_iter *,
                              const struct bkey_i *, enum btree_id, unsigned);
@@ -94,7 +89,7 @@ static inline unsigned btree_blocks(struct bch_fs *c)
 #define BTREE_FOREGROUND_MERGE_THRESHOLD(c)    (btree_max_u64s(c) * 1 / 3)
 #define BTREE_FOREGROUND_MERGE_HYSTERESIS(c)                   \
        (BTREE_FOREGROUND_MERGE_THRESHOLD(c) +                  \
-        (BTREE_FOREGROUND_MERGE_THRESHOLD(c) << 2))
+        (BTREE_FOREGROUND_MERGE_THRESHOLD(c) >> 2))
 
 #define btree_node_root(_c, _b)        ((_c)->btree_roots[(_b)->c.btree_id].b)