New upstream release

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

diff --git a/libbcachefs/btree_io.h b/libbcachefs/btree_io.h
index 4b1810ad7d912dd15f28498256b061ed57a86ece..0cadf651e7cfde8122dc1632a47e80bd7140c427 100644 (file)
--- a/libbcachefs/btree_io.h
+++ b/libbcachefs/btree_io.h
@@ -129,7 +129,7 @@ void bch2_btree_build_aux_trees(struct btree *);
 void bch2_btree_init_next(struct btree_trans *, struct btree *);
 
 int bch2_btree_node_read_done(struct bch_fs *, struct bch_dev *,
-                             struct btree *, bool);
+                             struct btree *, bool, 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);
@@ -178,7 +178,7 @@ static inline void compat_bformat(unsigned level, enum btree_id btree_id,
 
                f->field_offset[BKEY_FIELD_SNAPSHOT] = write
                        ? 0
-                       : U32_MAX - max_packed;
+                       : cpu_to_le64(U32_MAX - max_packed);
        }
 }
 
@@ -200,8 +200,8 @@ static inline void compat_btree_node(unsigned level, enum btree_id btree_id,
                                     struct btree_node *bn)
 {
        if (version < bcachefs_metadata_version_inode_btree_change &&
-           btree_node_type_is_extents(btree_id) &&
-           bpos_cmp(bn->min_key, POS_MIN) &&
+           btree_id_is_extents(btree_id) &&
+           !bpos_eq(bn->min_key, POS_MIN) &&
            write)
                bn->min_key = bpos_nosnap_predecessor(bn->min_key);
 
@@ -217,8 +217,8 @@ static inline void compat_btree_node(unsigned level, enum btree_id btree_id,
                bn->max_key.snapshot = U32_MAX;
 
        if (version < bcachefs_metadata_version_inode_btree_change &&
-           btree_node_type_is_extents(btree_id) &&
-           bpos_cmp(bn->min_key, POS_MIN) &&
+           btree_id_is_extents(btree_id) &&
+           !bpos_eq(bn->min_key, POS_MIN) &&
            !write)
                bn->min_key = bpos_nosnap_successor(bn->min_key);
 }