Disable pristine-tar option in gbp.conf, since there is no pristine-tar branch.

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

diff --git a/libbcachefs/btree_io.h b/libbcachefs/btree_io.h
index d818d87661e863a78b19b047276094e9a84696a1..e251cb6b965ff0a8bdc4aa0684dfdcaa315c32d6 100644 (file)
--- a/libbcachefs/btree_io.h
+++ b/libbcachefs/btree_io.h
@@ -7,7 +7,7 @@
 #include "btree_locking.h"
 #include "checksum.h"
 #include "extents.h"
-#include "io_types.h"
+#include "io_write_types.h"
 
 struct bch_fs;
 struct btree_write;
@@ -129,18 +129,19 @@ 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);
-void bch2_btree_node_read(struct bch_fs *, struct btree *, bool);
+                             struct btree *, bool, bool *);
+void bch2_btree_node_read(struct btree_trans *, struct btree *, bool);
 int bch2_btree_root_read(struct bch_fs *, enum btree_id,
                         const struct bkey_i *, unsigned);
 
-void bch2_btree_complete_write(struct bch_fs *, struct btree *,
-                             struct btree_write *);
-
 bool bch2_btree_post_write_cleanup(struct bch_fs *, struct btree *);
 
-#define BTREE_WRITE_ONLY_IF_NEED       (1U << 0)
-#define BTREE_WRITE_ALREADY_STARTED    (1U << 1)
+enum btree_write_flags {
+       __BTREE_WRITE_ONLY_IF_NEED = BTREE_WRITE_TYPE_BITS,
+       __BTREE_WRITE_ALREADY_STARTED,
+};
+#define BTREE_WRITE_ONLY_IF_NEED       BIT(__BTREE_WRITE_ONLY_IF_NEED)
+#define BTREE_WRITE_ALREADY_STARTED    BIT(__BTREE_WRITE_ALREADY_STARTED)
 
 void __bch2_btree_node_write(struct bch_fs *, struct btree *, unsigned);
 void bch2_btree_node_write(struct bch_fs *, struct btree *,
@@ -152,8 +153,8 @@ static inline void btree_node_write_if_need(struct bch_fs *c, struct btree *b,
        bch2_btree_node_write(c, b, lock_held, BTREE_WRITE_ONLY_IF_NEED);
 }
 
-void bch2_btree_flush_all_reads(struct bch_fs *);
-void bch2_btree_flush_all_writes(struct bch_fs *);
+bool bch2_btree_flush_all_reads(struct bch_fs *);
+bool bch2_btree_flush_all_writes(struct bch_fs *);
 
 static inline void compat_bformat(unsigned level, enum btree_id btree_id,
                                  unsigned version, unsigned big_endian,
@@ -174,7 +175,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);
        }
 }
 
@@ -196,8 +197,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);
 
@@ -213,10 +214,12 @@ 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);
 }
 
+void bch2_btree_write_stats_to_text(struct printbuf *, struct bch_fs *);
+
 #endif /* _BCACHEFS_BTREE_IO_H */