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

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

diff --git a/libbcachefs/super_types.h b/libbcachefs/super_types.h
index 3be05e9b08888032b7bf9455023cbbfc431de4b0..0e5a14fc8e7fbfde622ec68dfae45f69ad83bd87 100644 (file)
--- a/libbcachefs/super_types.h
+++ b/libbcachefs/super_types.h
@@ -1,12 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHEFS_SUPER_TYPES_H
 #define _BCACHEFS_SUPER_TYPES_H
 
 struct bch_sb_handle {
        struct bch_sb           *sb;
+       struct bdev_handle      *bdev_handle;
        struct block_device     *bdev;
+       char                    *sb_name;
        struct bio              *bio;
-       unsigned                page_order;
-       fmode_t                 mode;
+       void                    *holder;
+       size_t                  buffer_size;
+       blk_mode_t              mode;
+       unsigned                have_layout:1;
+       unsigned                have_bio:1;
+       unsigned                fs_sb:1;
+       u64                     seq;
 };
 
 struct bch_devs_mask {
@@ -15,7 +23,7 @@ struct bch_devs_mask {
 
 struct bch_devs_list {
        u8                      nr;
-       u8                      devs[BCH_REPLICAS_MAX + 1];
+       u8                      data[BCH_BKEY_PTRS_MAX];
 };
 
 struct bch_member_cpu {
@@ -24,33 +32,11 @@ struct bch_member_cpu {
        u16                     bucket_size;    /* sectors */
        u16                     group;
        u8                      state;
-       u8                      replacement;
        u8                      discard;
        u8                      data_allowed;
+       u8                      durability;
+       u8                      freespace_initialized;
        u8                      valid;
 };
 
-struct bch_replicas_cpu_entry {
-       u8                      data_type;
-       u8                      devs[BCH_SB_MEMBERS_MAX / 8];
-};
-
-struct bch_replicas_cpu {
-       struct rcu_head         rcu;
-       unsigned                nr;
-       unsigned                entry_size;
-       struct bch_replicas_cpu_entry entries[];
-};
-
-struct bch_disk_group_cpu {
-       struct bch_devs_mask            devs;
-       bool                            deleted;
-};
-
-struct bch_disk_groups_cpu {
-       struct rcu_head                 rcu;
-       unsigned                        nr;
-       struct bch_disk_group_cpu       entries[];
-};
-
 #endif /* _BCACHEFS_SUPER_TYPES_H */