Update bcachefs sources to a1b6677dca57 bcachefs: Fix looping around bch2_propagate_k...

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

diff --git a/libbcachefs/btree_cache.h b/libbcachefs/btree_cache.h
index b623c70282730336790e5553f1670e93c777b736..00c9b92183e7969839d48240e3e4b05498a98ed7 100644 (file)
--- a/libbcachefs/btree_cache.h
+++ b/libbcachefs/btree_cache.h
@@ -21,7 +21,7 @@ void bch2_btree_cache_cannibalize_unlock(struct bch_fs *);
 int bch2_btree_cache_cannibalize_lock(struct bch_fs *, struct closure *);
 
 struct btree *__bch2_btree_node_mem_alloc(struct bch_fs *);
-struct btree *bch2_btree_node_mem_alloc(struct bch_fs *, bool);
+struct btree *bch2_btree_node_mem_alloc(struct btree_trans *, bool);
 
 struct btree *bch2_btree_node_get(struct btree_trans *, struct btree_path *,
                                  const struct bkey_i *, unsigned,
@@ -30,7 +30,7 @@ struct btree *bch2_btree_node_get(struct btree_trans *, struct btree_path *,
 struct btree *bch2_btree_node_get_noiter(struct btree_trans *, const struct bkey_i *,
                                         enum btree_id, unsigned, bool);
 
-int bch2_btree_node_prefetch(struct bch_fs *, struct btree_trans *, struct btree_path *,
+int bch2_btree_node_prefetch(struct btree_trans *, struct btree_path *,
                             const struct bkey_i *, enum btree_id, unsigned);
 
 void bch2_btree_node_evict(struct btree_trans *, const struct bkey_i *);
@@ -45,7 +45,11 @@ static inline u64 btree_ptr_hash_val(const struct bkey_i *k)
        case KEY_TYPE_btree_ptr:
                return *((u64 *) bkey_i_to_btree_ptr_c(k)->v.start);
        case KEY_TYPE_btree_ptr_v2:
-               return bkey_i_to_btree_ptr_v2_c(k)->v.seq;
+               /*
+                * The cast/deref is only necessary to avoid sparse endianness
+                * warnings:
+                */
+               return *((u64 *) &bkey_i_to_btree_ptr_v2_c(k)->v.seq);
        default:
                return 0;
        }
@@ -97,10 +101,30 @@ static inline unsigned btree_blocks(struct bch_fs *c)
        (BTREE_FOREGROUND_MERGE_THRESHOLD(c) +                  \
         (BTREE_FOREGROUND_MERGE_THRESHOLD(c) >> 2))
 
-#define btree_node_root(_c, _b)        ((_c)->btree_roots[(_b)->c.btree_id].b)
+static inline unsigned btree_id_nr_alive(struct bch_fs *c)
+{
+       return BTREE_ID_NR + c->btree_roots_extra.nr;
+}
+
+static inline struct btree_root *bch2_btree_id_root(struct bch_fs *c, unsigned id)
+{
+       if (likely(id < BTREE_ID_NR)) {
+               return &c->btree_roots_known[id];
+       } else {
+               unsigned idx = id - BTREE_ID_NR;
+
+               EBUG_ON(idx >= c->btree_roots_extra.nr);
+               return &c->btree_roots_extra.data[idx];
+       }
+}
+
+static inline struct btree *btree_node_root(struct bch_fs *c, struct btree *b)
+{
+       return bch2_btree_id_root(c, b->c.btree_id)->b;
+}
 
 void bch2_btree_node_to_text(struct printbuf *, struct bch_fs *,
-                            struct btree *);
-void bch2_btree_cache_to_text(struct printbuf *, struct btree_cache *);
+                            const struct btree *);
+void bch2_btree_cache_to_text(struct printbuf *, const struct btree_cache *);
 
 #endif /* _BCACHEFS_BTREE_CACHE_H */