Update bcachefs sources to 8ffb42b3d0 bcachefs: Finish writing journal after journal...

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

diff --git a/libbcachefs/btree_update_interior.h b/libbcachefs/btree_update_interior.h
index e88e737ee8134e8365fcd451bba8257f08a4820a..8dc86fa636d680900034d8c1b9efd0c1374d0b15 100644 (file)
--- a/libbcachefs/btree_update_interior.h
+++ b/libbcachefs/btree_update_interior.h
@@ -35,6 +35,7 @@ bool bch2_btree_node_format_fits(struct bch_fs *c, struct btree *,
 struct btree_update {
        struct closure                  cl;
        struct bch_fs                   *c;
+       u64                             start_time;
 
        struct list_head                list;
        struct list_head                unwritten_list;
@@ -81,12 +82,12 @@ struct btree_update {
        /* Nodes being freed: */
        struct keylist                  old_keys;
        u64                             _old_keys[BTREE_UPDATE_NODES_MAX *
-                                                 BKEY_BTREE_PTR_VAL_U64s_MAX];
+                                                 BKEY_BTREE_PTR_U64s_MAX];
 
        /* Nodes being added: */
        struct keylist                  new_keys;
        u64                             _new_keys[BTREE_UPDATE_NODES_MAX *
-                                                 BKEY_BTREE_PTR_VAL_U64s_MAX];
+                                                 BKEY_BTREE_PTR_U64s_MAX];
 
        /* New nodes, that will be made reachable by this update: */
        struct btree                    *new_nodes[BTREE_UPDATE_NODES_MAX];
@@ -113,57 +114,39 @@ struct btree_update {
        u64                             inline_keys[BKEY_BTREE_PTR_U64s_MAX * 3];
 };
 
-void bch2_btree_node_free_inmem(struct bch_fs *, struct btree *,
-                               struct btree_iter *);
-void bch2_btree_node_free_never_inserted(struct bch_fs *, struct btree *);
-
-void bch2_btree_update_get_open_buckets(struct btree_update *, struct btree *);
-
 struct btree *__bch2_btree_node_alloc_replacement(struct btree_update *,
                                                  struct btree *,
                                                  struct bkey_format);
 
-void bch2_btree_update_done(struct btree_update *);
-struct btree_update *
-bch2_btree_update_start(struct btree_iter *, unsigned, unsigned, unsigned);
-
-void bch2_btree_interior_update_will_free_node(struct btree_update *,
-                                              struct btree *);
-void bch2_btree_update_add_new_node(struct btree_update *, struct btree *);
-
-int bch2_btree_split_leaf(struct btree_trans *, struct btree_iter *, unsigned);
+int bch2_btree_split_leaf(struct btree_trans *, struct btree_path *, unsigned);
 
-int __bch2_foreground_maybe_merge(struct btree_trans *, struct btree_iter *,
+int __bch2_foreground_maybe_merge(struct btree_trans *, struct btree_path *,
                                  unsigned, unsigned, enum btree_node_sibling);
 
 static inline int bch2_foreground_maybe_merge_sibling(struct btree_trans *trans,
-                                       struct btree_iter *iter,
+                                       struct btree_path *path,
                                        unsigned level, unsigned flags,
                                        enum btree_node_sibling sib)
 {
        struct btree *b;
 
-       if (iter->uptodate >= BTREE_ITER_NEED_TRAVERSE)
-               return 0;
-
-       if (!bch2_btree_node_relock(iter, level))
-               return 0;
+       EBUG_ON(!btree_node_locked(path, level));
 
-       b = iter->l[level].b;
+       b = path->l[level].b;
        if (b->sib_u64s[sib] > trans->c->btree_foreground_merge_threshold)
                return 0;
 
-       return __bch2_foreground_maybe_merge(trans, iter, level, flags, sib);
+       return __bch2_foreground_maybe_merge(trans, path, level, flags, sib);
 }
 
 static inline int bch2_foreground_maybe_merge(struct btree_trans *trans,
-                                             struct btree_iter *iter,
+                                             struct btree_path *path,
                                              unsigned level,
                                              unsigned flags)
 {
-       return  bch2_foreground_maybe_merge_sibling(trans, iter, level, flags,
+       return  bch2_foreground_maybe_merge_sibling(trans, path, level, flags,
                                                    btree_prev_sib) ?:
-               bch2_foreground_maybe_merge_sibling(trans, iter, level, flags,
+               bch2_foreground_maybe_merge_sibling(trans, path, level, flags,
                                                    btree_next_sib);
 }
 
@@ -235,7 +218,7 @@ static inline ssize_t __bch_btree_u64s_remaining(struct bch_fs *c,
 {
        ssize_t used = bset_byte_offset(b, end) / sizeof(u64) +
                b->whiteout_u64s;
-       ssize_t total = c->opts.btree_node_size << 6;
+       ssize_t total = c->opts.btree_node_size >> 3;
 
        /* Always leave one extra u64 for bch2_varint_decode: */
        used++;