Update bcachefs sources to 25de2b00dc bcachefs: Change check for invalid key types

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

diff --git a/libbcachefs/buckets.h b/libbcachefs/buckets.h
index d677b0225c52bf1d9388790e8680805a124f572e..400d105fd09165aef446af108a619f1e4b6e2d5b 100644 (file)
--- a/libbcachefs/buckets.h
+++ b/libbcachefs/buckets.h
@@ -150,26 +150,27 @@ static inline struct bch_dev_usage bch2_dev_usage_read(struct bch_dev *ca)
 
 void bch2_dev_usage_init(struct bch_dev *);
 
-static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum alloc_reserve reserve)
+static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_watermark watermark)
 {
        s64 reserved = 0;
 
-       switch (reserve) {
-       case RESERVE_NR:
+       switch (watermark) {
+       case BCH_WATERMARK_NR:
                unreachable();
-       case RESERVE_stripe:
+       case BCH_WATERMARK_stripe:
                reserved += ca->mi.nbuckets >> 6;
                fallthrough;
-       case RESERVE_none:
+       case BCH_WATERMARK_normal:
                reserved += ca->mi.nbuckets >> 6;
                fallthrough;
-       case RESERVE_movinggc:
+       case BCH_WATERMARK_copygc:
                reserved += ca->nr_btree_reserve;
                fallthrough;
-       case RESERVE_btree:
+       case BCH_WATERMARK_btree:
                reserved += ca->nr_btree_reserve;
                fallthrough;
-       case RESERVE_btree_movinggc:
+       case BCH_WATERMARK_btree_copygc:
+       case BCH_WATERMARK_reclaim:
                break;
        }
 
@@ -178,17 +179,17 @@ static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum alloc_reser
 
 static inline u64 dev_buckets_free(struct bch_dev *ca,
                                   struct bch_dev_usage usage,
-                                  enum alloc_reserve reserve)
+                                  enum bch_watermark watermark)
 {
        return max_t(s64, 0,
                     usage.d[BCH_DATA_free].buckets -
                     ca->nr_open_buckets -
-                    bch2_dev_buckets_reserved(ca, reserve));
+                    bch2_dev_buckets_reserved(ca, watermark));
 }
 
 static inline u64 __dev_buckets_available(struct bch_dev *ca,
                                          struct bch_dev_usage usage,
-                                         enum alloc_reserve reserve)
+                                         enum bch_watermark watermark)
 {
        return max_t(s64, 0,
                       usage.d[BCH_DATA_free].buckets
@@ -196,21 +197,35 @@ static inline u64 __dev_buckets_available(struct bch_dev *ca,
                     + usage.d[BCH_DATA_need_gc_gens].buckets
                     + usage.d[BCH_DATA_need_discard].buckets
                     - ca->nr_open_buckets
-                    - bch2_dev_buckets_reserved(ca, reserve));
+                    - bch2_dev_buckets_reserved(ca, watermark));
 }
 
 static inline u64 dev_buckets_available(struct bch_dev *ca,
-                                       enum alloc_reserve reserve)
+                                       enum bch_watermark watermark)
 {
-       return __dev_buckets_available(ca, bch2_dev_usage_read(ca), reserve);
+       return __dev_buckets_available(ca, bch2_dev_usage_read(ca), watermark);
 }
 
 /* Filesystem usage: */
 
+static inline unsigned __fs_usage_u64s(unsigned nr_replicas)
+{
+       return sizeof(struct bch_fs_usage) / sizeof(u64) + nr_replicas;
+}
+
 static inline unsigned fs_usage_u64s(struct bch_fs *c)
 {
-       return sizeof(struct bch_fs_usage) / sizeof(u64) +
-               READ_ONCE(c->replicas.nr);
+       return __fs_usage_u64s(READ_ONCE(c->replicas.nr));
+}
+
+static inline unsigned __fs_usage_online_u64s(unsigned nr_replicas)
+{
+       return sizeof(struct bch_fs_usage_online) / sizeof(u64) + nr_replicas;
+}
+
+static inline unsigned fs_usage_online_u64s(struct bch_fs *c)
+{
+       return __fs_usage_online_u64s(READ_ONCE(c->replicas.nr));
 }
 
 static inline unsigned dev_usage_u64s(void)
@@ -259,6 +274,20 @@ int bch2_trans_mark_inode(struct btree_trans *, enum btree_id, unsigned, struct
 int bch2_trans_mark_reservation(struct btree_trans *, enum btree_id, unsigned, struct bkey_s_c, struct bkey_i *, unsigned);
 int bch2_trans_mark_reflink_p(struct btree_trans *, enum btree_id, unsigned, struct bkey_s_c, struct bkey_i *, unsigned);
 
+#define mem_trigger_run_insert_then_overwrite(_fn, _trans, _btree_id, _level, _old, _new, _flags)\
+({                                                                                             \
+       int ret = 0;                                                                            \
+                                                                                               \
+       if (_new.k->type)                                                       \
+               ret = _fn(_trans, _btree_id, _level, _new, _flags & ~BTREE_TRIGGER_OVERWRITE);  \
+       if (_old.k->type && !ret)                                               \
+               ret = _fn(_trans, _btree_id, _level, _old, _flags & ~BTREE_TRIGGER_INSERT);     \
+       ret;                                                                                    \
+})
+
+#define trigger_run_insert_then_overwrite(_fn, _trans, _btree_id, _level, _old, _new, _flags)  \
+       mem_trigger_run_insert_then_overwrite(_fn, _trans, _btree_id, _level, _old, bkey_i_to_s_c(_new), _flags)
+
 void bch2_trans_fs_usage_revert(struct btree_trans *, struct replicas_delta_list *);
 int bch2_trans_fs_usage_apply(struct btree_trans *, struct replicas_delta_list *);