Update bcachefs sources to 400f275d46 bcachefs: Fix check_overlapping_extents()

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

diff --git a/libbcachefs/buckets_types.h b/libbcachefs/buckets_types.h
index 588b1a72adaec00ddc17b24df784b6540a7935b1..2a9dab9006efa68ca64648d866fec47010b58ad2 100644 (file)
--- a/libbcachefs/buckets_types.h
+++ b/libbcachefs/buckets_types.h
@@ -7,42 +7,15 @@
 
 #define BUCKET_JOURNAL_SEQ_BITS                16
 
-struct bucket_mark {
-       union {
-       atomic64_t      v;
-
-       struct {
-       u8              gen;
-       u8              data_type:3,
-                       owned_by_allocator:1,
-                       journal_seq_valid:1,
-                       stripe:1;
-       u16             dirty_sectors;
-       u16             cached_sectors;
-
-       /*
-        * low bits of journal sequence number when this bucket was most
-        * recently modified: if journal_seq_valid is set, this bucket can't be
-        * reused until the journal sequence number written to disk is >= the
-        * bucket's journal sequence number:
-        */
-       u16             journal_seq;
-       };
-       };
-};
-
 struct bucket {
-       union {
-               struct bucket_mark      _mark;
-               const struct bucket_mark mark;
-       };
-
-       u64                             io_time[2];
-       u8                              oldest_gen;
-       u8                              gc_gen;
-       unsigned                        gen_valid:1;
-       u8                              stripe_redundancy;
-       u32                             stripe;
+       u8                      lock;
+       u8                      gen_valid:1;
+       u8                      data_type:7;
+       u8                      gen;
+       u8                      stripe_redundancy;
+       u32                     stripe;
+       u32                     dirty_sectors;
+       u32                     cached_sectors;
 };
 
 struct bucket_array {
@@ -52,13 +25,24 @@ struct bucket_array {
        struct bucket           b[];
 };
 
+struct bucket_gens {
+       struct rcu_head         rcu;
+       u16                     first_bucket;
+       size_t                  nbuckets;
+       u8                      b[];
+};
+
 struct bch_dev_usage {
        u64                     buckets_ec;
-       u64                     buckets_unavailable;
 
        struct {
                u64             buckets;
                u64             sectors; /* _compressed_ sectors: */
+               /*
+                * XXX
+                * Why do we have this? Isn't it just buckets * bucket_size -
+                * sectors?
+                */
                u64             fragmented;
        }                       d[BCH_DATA_NR];
 };
@@ -105,15 +89,4 @@ struct disk_reservation {
        unsigned                nr_replicas;
 };
 
-struct copygc_heap_entry {
-       u8                      dev;
-       u8                      gen;
-       u8                      replicas;
-       u16                     fragmentation;
-       u32                     sectors;
-       u64                     offset;
-};
-
-typedef HEAP(struct copygc_heap_entry) copygc_heap;
-
 #endif /* _BUCKETS_TYPES_H */