Update bcachefs sources to 400c2f8d96 bcachefs: Mask out unknown compat features...

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

diff --git a/libbcachefs/btree_io.h b/libbcachefs/btree_io.h
index 16ce6dff6af7eb00c62d4b670a01676e53e07f8c..89fd4aba521880624e39d73faf28aaff9a9241ae 100644 (file)
--- a/libbcachefs/btree_io.h
+++ b/libbcachefs/btree_io.h
@@ -13,6 +13,7 @@ struct bch_fs;
 struct btree_write;
 struct btree;
 struct btree_iter;
+struct btree_node_read_all;
 
 static inline bool btree_node_dirty(struct btree *b)
 {
@@ -33,8 +34,11 @@ static inline void clear_btree_node_dirty(struct bch_fs *c, struct btree *b)
 
 struct btree_read_bio {
        struct bch_fs           *c;
+       struct btree            *b;
+       struct btree_node_read_all *ra;
        u64                     start_time;
        unsigned                have_ioref:1;
+       unsigned                idx:7;
        struct extent_ptr_decoded       pick;
        struct work_struct      work;
        struct bio              bio;
@@ -42,29 +46,18 @@ struct btree_read_bio {
 
 struct btree_write_bio {
        struct work_struct      work;
+       __BKEY_PADDED(key, BKEY_BTREE_PTR_VAL_U64s_MAX);
        void                    *data;
        unsigned                bytes;
        struct bch_write_bio    wbio;
 };
 
-static inline void btree_node_io_unlock(struct btree *b)
-{
-       EBUG_ON(!btree_node_write_in_flight(b));
-       clear_btree_node_write_in_flight(b);
-       wake_up_bit(&b->flags, BTREE_NODE_write_in_flight);
-}
-
-static inline void btree_node_io_lock(struct btree *b)
-{
-       wait_on_bit_lock_io(&b->flags, BTREE_NODE_write_in_flight,
-                           TASK_UNINTERRUPTIBLE);
-}
-
-static inline void btree_node_wait_on_io(struct btree *b)
-{
-       wait_on_bit_io(&b->flags, BTREE_NODE_write_in_flight,
-                      TASK_UNINTERRUPTIBLE);
-}
+void bch2_btree_node_io_unlock(struct btree *);
+void bch2_btree_node_io_lock(struct btree *);
+void __bch2_btree_node_wait_on_read(struct btree *);
+void __bch2_btree_node_wait_on_write(struct btree *);
+void bch2_btree_node_wait_on_read(struct btree *);
+void bch2_btree_node_wait_on_write(struct btree *);
 
 static inline bool btree_node_may_write(struct btree *b)
 {
@@ -130,9 +123,11 @@ static inline void bset_encrypt(struct bch_fs *c, struct bset *i, unsigned offse
 
 void bch2_btree_sort_into(struct bch_fs *, struct btree *, struct btree *);
 
+void bch2_btree_node_drop_keys_outside_node(struct btree *);
+
 void bch2_btree_build_aux_trees(struct btree *);
-void bch2_btree_init_next(struct bch_fs *, struct btree *,
-                        struct btree_iter *);
+void bch2_btree_init_next(struct btree_trans *, struct btree_iter *,
+                         struct btree *);
 
 int bch2_btree_node_read_done(struct bch_fs *, struct bch_dev *,
                              struct btree *, bool);
@@ -144,8 +139,7 @@ void bch2_btree_complete_write(struct bch_fs *, struct btree *,
                              struct btree_write *);
 void bch2_btree_write_error_work(struct work_struct *);
 
-void __bch2_btree_node_write(struct bch_fs *, struct btree *,
-                           enum six_lock_type);
+void __bch2_btree_node_write(struct bch_fs *, struct btree *);
 bool bch2_btree_post_write_cleanup(struct bch_fs *, struct btree *);
 
 void bch2_btree_node_write(struct bch_fs *, struct btree *,
@@ -163,7 +157,7 @@ static inline void btree_node_write_if_need(struct bch_fs *c, struct btree *b,
                }
 
                six_unlock_type(&b->c.lock, lock_held);
-               btree_node_wait_on_io(b);
+               bch2_btree_node_wait_on_write(b);
                btree_node_lock_type(c, b, lock_held);
        }
 }
@@ -189,8 +183,8 @@ void bch2_btree_flush_all_writes(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) {
@@ -199,6 +193,16 @@ static inline void compat_bformat(unsigned level, enum btree_id btree_id,
                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,
@@ -220,18 +224,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 */