bcachefs: trans_commit() path can now insert to interior nodes

This will be needed for the upcoming patches to journal updates to
interior btree nodes.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

1 files changed, 16 insertions, 5 deletions

diff --git a/fs/bcachefs/recovery.h b/fs/bcachefs/recovery.h
index c91309301563..fa1f2818817d 100644
--- a/fs/bcachefs/recovery.h
+++ b/fs/bcachefs/recovery.h
@@ -5,6 +5,7 @@
 struct journal_keys {
 	struct journal_key {
 		enum btree_id	btree_id:8;
+		unsigned	level:8;
 		struct bkey_i	*k;
 		u32		journal_seq;
 		u32		journal_offset;
@@ -17,15 +18,23 @@ struct journal_keys {
 	for (i = (keys).d; i < (keys).d + (keys).nr; (i)++)
 
 struct journal_iter {
+	enum btree_id		btree_id;
+	unsigned		level;
 	struct journal_keys	*keys;
 	struct journal_key	*k;
-	enum btree_id		btree_id;
 };
 
-struct btree_and_journal_iter {
-	enum btree_id		btree_id;
+/*
+ * Iterate over keys in the btree, with keys from the journal overlaid on top:
+ */
 
+struct btree_and_journal_iter {
 	struct btree_iter	*btree;
+
+	struct btree		*b;
+	struct btree_node_iter	node_iter;
+	struct bkey		unpacked;
+
 	struct journal_iter	journal;
 
 	enum last_key_returned {
@@ -38,12 +47,14 @@ struct btree_and_journal_iter {
 void bch2_btree_and_journal_iter_advance(struct btree_and_journal_iter *);
 struct bkey_s_c bch2_btree_and_journal_iter_peek(struct btree_and_journal_iter *);
 struct bkey_s_c bch2_btree_and_journal_iter_next(struct btree_and_journal_iter *);
-struct journal_key *journal_key_search(struct journal_keys *,
-				       enum btree_id, struct bpos);
+
 void bch2_btree_and_journal_iter_init(struct btree_and_journal_iter *,
 				      struct btree_trans *,
 				      struct journal_keys *,
 				      enum btree_id, struct bpos);
+void bch2_btree_and_journal_iter_init_node_iter(struct btree_and_journal_iter *,
+						struct journal_keys *,
+						struct btree *);
 
 int bch2_fs_recovery(struct bch_fs *);
 int bch2_fs_initialize(struct bch_fs *);