Update bcachefs sources to 50847e296b34 bcachefs: Check subvol <-> inode pointers...

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

diff --git a/libbcachefs/ec_types.h b/libbcachefs/ec_types.h
index 3fc31222459a81fd92ec2fbdc1225d5bf9bedbfe..976426da3a124aaeb7edd70747cd71e547558224 100644 (file)
--- a/libbcachefs/ec_types.h
+++ b/libbcachefs/ec_types.h
@@ -2,25 +2,29 @@
 #ifndef _BCACHEFS_EC_TYPES_H
 #define _BCACHEFS_EC_TYPES_H
 
-#include <linux/llist.h>
+#include "bcachefs_format.h"
 
 struct bch_replicas_padded {
-       struct bch_replicas_entry       e;
+       struct bch_replicas_entry_v1    e;
        u8                              pad[BCH_BKEY_PTRS_MAX];
 };
 
 struct stripe {
        size_t                  heap_idx;
-
        u16                     sectors;
        u8                      algorithm;
+       u8                      nr_blocks;
+       u8                      nr_redundant;
+       u8                      blocks_nonempty;
+};
+
+struct gc_stripe {
+       u16                     sectors;
 
        u8                      nr_blocks;
        u8                      nr_redundant;
 
        unsigned                alive:1; /* does a corresponding key exist in stripes btree? */
-       unsigned                on_heap:1;
-       u8                      blocks_nonempty;
        u16                     block_sectors[BCH_BKEY_PTRS_MAX];
        struct bch_extent_ptr   ptrs[BCH_BKEY_PTRS_MAX];