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

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

diff --git a/libbcachefs/buckets_types.h b/libbcachefs/buckets_types.h
index 63f1b27f5ee3ceec7b800df3ba1b43608912d191..6a31740222a7132e3f0735675ba63ed3402f00a8 100644 (file)
--- a/libbcachefs/buckets_types.h
+++ b/libbcachefs/buckets_types.h
@@ -1,98 +1,85 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BUCKETS_TYPES_H
 #define _BUCKETS_TYPES_H
 
+#include "bcachefs_format.h"
 #include "util.h"
 
-/* kill, switch to bch_data_type */
-enum bucket_data_type {
-       BUCKET_DATA     = 0,
-       BUCKET_BTREE,
-       BUCKET_JOURNAL,
-       BUCKET_SB,
-};
-
-struct bucket_mark {
-       union {
-       struct {
-               u64             counter;
-       };
-
-       struct {
-               u8              gen;
-               u8              data_type:3,
-                               gen_valid:1,
-                               owned_by_allocator:1,
-                               nouse:1,
-                               journal_seq_valid:1,
-                               touched_this_mount: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;
-       };
-       };
-};
+#define BUCKET_JOURNAL_SEQ_BITS                16
 
 struct bucket {
-       u16                             prio[2];
+       u8                      lock;
+       u8                      gen_valid:1;
+       u8                      data_type:7;
+       u8                      gen;
+       u8                      stripe_redundancy;
+       u32                     stripe;
+       u32                     dirty_sectors;
+       u32                     cached_sectors;
+};
 
-       union {
-               struct bucket_mark      _mark;
-               const struct bucket_mark mark;
-       };
+struct bucket_array {
+       struct rcu_head         rcu;
+       u16                     first_bucket;
+       size_t                  nbuckets;
+       struct bucket           b[];
 };
 
-/* kill, switch to bucket_data_type */
-enum s_alloc {
-       S_META,
-       S_DIRTY,
-       S_ALLOC_NR,
+struct bucket_gens {
+       struct rcu_head         rcu;
+       u16                     first_bucket;
+       size_t                  nbuckets;
+       u8                      b[];
 };
 
 struct bch_dev_usage {
-       u64                     buckets[S_ALLOC_NR];
-       u64                     buckets_cached;
-       u64                     buckets_alloc;
+       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];
+};
 
-       /* _compressed_ sectors: */
-       u64                     sectors[S_ALLOC_NR];
-       u64                     sectors_cached;
+struct bch_fs_usage_base {
+       u64                     hidden;
+       u64                     btree;
+       u64                     data;
+       u64                     cached;
+       u64                     reserved;
+       u64                     nr_inodes;
 };
 
 struct bch_fs_usage {
        /* all fields are in units of 512 byte sectors: */
+       struct bch_fs_usage_base b;
+       u64                     persistent_reserved[BCH_REPLICAS_MAX];
+       u64                     replicas[];
+};
 
-       /* _uncompressed_ sectors: */
-
-       struct {
-               u64             data[S_ALLOC_NR];
-               u64             persistent_reserved;
-       }                       s[BCH_REPLICAS_MAX];
-
+struct bch_fs_usage_online {
        u64                     online_reserved;
-       u64                     available_cache;
+       struct bch_fs_usage     u;
 };
 
-struct bucket_heap_entry {
-       size_t                  bucket;
-       struct bucket_mark      mark;
+struct bch_fs_usage_short {
+       u64                     capacity;
+       u64                     used;
+       u64                     free;
+       u64                     nr_inodes;
 };
 
-typedef HEAP(struct bucket_heap_entry) bucket_heap;
-
 /*
  * A reservation for space on disk:
  */
 struct disk_reservation {
-       u64             sectors;
-       u32             gen;
-       unsigned        nr_replicas;
+       u64                     sectors;
+       u32                     gen;
+       unsigned                nr_replicas;
 };
 
 #endif /* _BUCKETS_TYPES_H */