New upstream snapshot

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

diff --git a/libbcachefs/btree_io.h b/libbcachefs/btree_io.h
index 626d0f071b7008d7f9f76f89df0a1bda34adb2b0..9c14cd30a09e18d112c94e680cdbe80279b0852b 100644 (file)
--- a/libbcachefs/btree_io.h
+++ b/libbcachefs/btree_io.h
@@ -14,6 +14,23 @@ struct btree_write;
 struct btree;
 struct btree_iter;
 
+static inline bool btree_node_dirty(struct btree *b)
+{
+       return test_bit(BTREE_NODE_dirty, &b->flags);
+}
+
+static inline void set_btree_node_dirty(struct bch_fs *c, struct btree *b)
+{
+       if (!test_and_set_bit(BTREE_NODE_dirty, &b->flags))
+               atomic_inc(&c->btree_cache.dirty);
+}
+
+static inline void clear_btree_node_dirty(struct bch_fs *c, struct btree *b)
+{
+       if (test_and_clear_bit(BTREE_NODE_dirty, &b->flags))
+               atomic_dec(&c->btree_cache.dirty);
+}
+
 struct btree_read_bio {
        struct bch_fs           *c;
        u64                     start_time;
@@ -117,7 +134,8 @@ void bch2_btree_build_aux_trees(struct btree *);
 void bch2_btree_init_next(struct bch_fs *, struct btree *,
                         struct btree_iter *);
 
-int bch2_btree_node_read_done(struct bch_fs *, struct btree *, bool);
+int bch2_btree_node_read_done(struct bch_fs *, struct bch_dev *,
+                             struct btree *, bool);
 void bch2_btree_node_read(struct bch_fs *, struct btree *, bool);
 int bch2_btree_root_read(struct bch_fs *, enum btree_id,
                         const struct bkey_i *, unsigned);
@@ -168,20 +186,29 @@ do {                                                                      \
 
 void bch2_btree_flush_all_reads(struct bch_fs *);
 void bch2_btree_flush_all_writes(struct bch_fs *);
-void bch2_btree_verify_flushed(struct bch_fs *);
 void bch2_dirty_btree_nodes_to_text(struct printbuf *, struct bch_fs *);
 
 static inline void compat_bformat(unsigned level, enum btree_id btree_id,
-                                unsigned version, unsigned big_endian,
-                                int write, struct bkey_format *f)
+                                 unsigned version, unsigned big_endian,
+                                 int write, struct bkey_format *f)
 {
        if (version < bcachefs_metadata_version_inode_btree_change &&
-           btree_id == BTREE_ID_INODES) {
+           btree_id == BTREE_ID_inodes) {
                swap(f->bits_per_field[BKEY_FIELD_INODE],
                     f->bits_per_field[BKEY_FIELD_OFFSET]);
                swap(f->field_offset[BKEY_FIELD_INODE],
                     f->field_offset[BKEY_FIELD_OFFSET]);
        }
+
+       if (version < bcachefs_metadata_version_snapshot &&
+           (level || btree_type_has_snapshots(btree_id))) {
+               u64 max_packed =
+                       ~(~0ULL << f->bits_per_field[BKEY_FIELD_SNAPSHOT]);
+
+               f->field_offset[BKEY_FIELD_SNAPSHOT] = write
+                       ? 0
+                       : U32_MAX - max_packed;
+       }
 }
 
 static inline void compat_bpos(unsigned level, enum btree_id btree_id,
@@ -192,7 +219,7 @@ static inline void compat_bpos(unsigned level, enum btree_id btree_id,
                bch2_bpos_swab(p);
 
        if (version < bcachefs_metadata_version_inode_btree_change &&
-           btree_id == BTREE_ID_INODES)
+           btree_id == BTREE_ID_inodes)
                swap(p->inode, p->offset);
 }
 
@@ -203,18 +230,26 @@ static inline void compat_btree_node(unsigned level, enum btree_id btree_id,
 {
        if (version < bcachefs_metadata_version_inode_btree_change &&
            btree_node_type_is_extents(btree_id) &&
-           bkey_cmp(bn->min_key, POS_MIN) &&
+           bpos_cmp(bn->min_key, POS_MIN) &&
            write)
-               bn->min_key = bkey_predecessor(bn->min_key);
+               bn->min_key = bpos_nosnap_predecessor(bn->min_key);
+
+       if (version < bcachefs_metadata_version_snapshot &&
+           write)
+               bn->max_key.snapshot = 0;
 
        compat_bpos(level, btree_id, version, big_endian, write, &bn->min_key);
        compat_bpos(level, btree_id, version, big_endian, write, &bn->max_key);
 
+       if (version < bcachefs_metadata_version_snapshot &&
+           !write)
+               bn->max_key.snapshot = U32_MAX;
+
        if (version < bcachefs_metadata_version_inode_btree_change &&
            btree_node_type_is_extents(btree_id) &&
-           bkey_cmp(bn->min_key, POS_MIN) &&
+           bpos_cmp(bn->min_key, POS_MIN) &&
            !write)
-               bn->min_key = bkey_successor(bn->min_key);
+               bn->min_key = bpos_nosnap_successor(bn->min_key);
 }
 
 #endif /* _BCACHEFS_BTREE_IO_H */