Update bcachefs sources to 3e0c5b0722 fixup! bcachefs: Btree write buffer

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

diff --git a/libbcachefs/btree_update.h b/libbcachefs/btree_update.h
index 673c3a78aae258cbb7fe9e32d8fca8e86ba0750f..771e4b239c66b234883363c1d222662fdbc2948b 100644 (file)
--- a/libbcachefs/btree_update.h
+++ b/libbcachefs/btree_update.h
@@ -15,6 +15,9 @@ bool bch2_btree_bset_insert_key(struct btree_trans *, struct btree_path *,
                                struct bkey_i *);
 void bch2_btree_add_journal_pin(struct bch_fs *, struct btree *, u64);
 
+void bch2_btree_insert_key_leaf(struct btree_trans *, struct btree_path *,
+                               struct bkey_i *, u64);
+
 enum btree_insert_flags {
        /* First two bits for journal watermark: */
        __BTREE_INSERT_NOFAIL = 2,
@@ -55,7 +58,8 @@ int bch2_btree_delete_extent_at(struct btree_trans *, struct btree_iter *,
                                unsigned, unsigned);
 int bch2_btree_delete_at(struct btree_trans *, struct btree_iter *, unsigned);
 
-int __bch2_btree_insert(struct btree_trans *, enum btree_id, struct bkey_i *);
+int __bch2_btree_insert(struct btree_trans *, enum btree_id, struct bkey_i *,
+                       enum btree_update_flags);
 int bch2_btree_insert(struct bch_fs *, enum btree_id, struct bkey_i *,
                     struct disk_reservation *, u64 *, int flags);
 
@@ -77,6 +81,8 @@ int bch2_trans_update_extent(struct btree_trans *, struct btree_iter *,
 
 int __must_check bch2_trans_update(struct btree_trans *, struct btree_iter *,
                                   struct bkey_i *, enum btree_update_flags);
+int __must_check bch2_trans_update_buffered(struct btree_trans *,
+                                           enum btree_id, struct bkey_i *);
 
 void bch2_trans_commit_hook(struct btree_trans *,
                            struct btree_trans_commit_hook *);
@@ -142,6 +148,11 @@ static inline int bch2_trans_commit(struct btree_trans *trans,
             (_i) < (_trans)->updates + (_trans)->nr_updates;           \
             (_i)++)
 
+#define trans_for_each_wb_update(_trans, _i)                           \
+       for ((_i) = (_trans)->wb_updates;                               \
+            (_i) < (_trans)->wb_updates + (_trans)->nr_wb_updates;     \
+            (_i)++)
+
 static inline void bch2_trans_reset_updates(struct btree_trans *trans)
 {
        struct btree_insert_entry *i;
@@ -151,6 +162,8 @@ static inline void bch2_trans_reset_updates(struct btree_trans *trans)
 
        trans->extra_journal_res        = 0;
        trans->nr_updates               = 0;
+       trans->nr_wb_updates            = 0;
+       trans->wb_updates               = NULL;
        trans->hooks                    = NULL;
        trans->extra_journal_entries.nr = 0;