Update bcachefs sources to bca25b802d fixup! bcachefs: Fix bch2_check_discard_freespa...

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

diff --git a/libbcachefs/recovery.h b/libbcachefs/recovery.h
index 479ea46f8dcb5954acc13d732646aff733b890c0..8c0348e8b84cf00de92fcfebc588a64957d2253a 100644 (file)
--- a/libbcachefs/recovery.h
+++ b/libbcachefs/recovery.h
@@ -2,32 +2,55 @@
 #ifndef _BCACHEFS_RECOVERY_H
 #define _BCACHEFS_RECOVERY_H
 
-struct journal_keys {
-       struct journal_key {
-               enum btree_id   btree_id:8;
-               unsigned        allocated:1;
-               struct bpos     pos;
-               struct bkey_i   *k;
-               u32             journal_seq;
-               u32             journal_offset;
-       }                       *d;
-       size_t                  nr;
-       u64                     journal_seq_base;
+struct journal_iter {
+       struct list_head        list;
+       enum btree_id           btree_id;
+       unsigned                level;
+       size_t                  idx;
+       struct journal_keys     *keys;
 };
 
-#define for_each_journal_key(keys, i)                          \
-       for (i = (keys).d; i < (keys).d + (keys).nr; (i)++)
+/*
+ * Iterate over keys in the btree, with keys from the journal overlaid on top:
+ */
 
-struct journal_iter {
-       struct journal_keys     *keys;
-       struct journal_key      *k;
-       enum btree_id           btree_id;
+struct btree_and_journal_iter {
+       struct btree            *b;
+       struct btree_node_iter  node_iter;
+       struct bkey             unpacked;
+
+       struct journal_iter     journal;
+       struct bpos             pos;
+       bool                    at_end;
 };
 
-struct journal_iter bch2_journal_iter_init(struct journal_keys *,
-                                          enum btree_id);
-struct bkey_s_c bch2_journal_iter_peek(struct journal_iter *);
-struct bkey_s_c bch2_journal_iter_next(struct journal_iter *);
+struct bkey_i *bch2_journal_keys_peek_upto(struct bch_fs *, enum btree_id,
+                               unsigned, struct bpos, struct bpos, size_t *);
+struct bkey_i *bch2_journal_keys_peek_slot(struct bch_fs *, enum btree_id,
+                                          unsigned, struct bpos);
+
+int bch2_journal_key_insert_take(struct bch_fs *, enum btree_id,
+                                unsigned, struct bkey_i *);
+int bch2_journal_key_insert(struct bch_fs *, enum btree_id,
+                           unsigned, struct bkey_i *);
+int bch2_journal_key_delete(struct bch_fs *, enum btree_id,
+                           unsigned, struct bpos);
+void bch2_journal_key_overwritten(struct bch_fs *, enum btree_id,
+                                 unsigned, struct bpos);
+
+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 *);
+
+void bch2_btree_and_journal_iter_exit(struct btree_and_journal_iter *);
+void __bch2_btree_and_journal_iter_init_node_iter(struct btree_and_journal_iter *,
+                               struct bch_fs *, struct btree *,
+                               struct btree_node_iter, struct bpos);
+void bch2_btree_and_journal_iter_init_node_iter(struct btree_and_journal_iter *,
+                                               struct bch_fs *,
+                                               struct btree *);
+
+void bch2_journal_keys_free(struct journal_keys *);
+void bch2_journal_entries_free(struct bch_fs *);
 
 int bch2_fs_recovery(struct bch_fs *);
 int bch2_fs_initialize(struct bch_fs *);