Update bcachefs sources to d267e10a43b2 bcachefs: __bch2_sb_field_to_text()

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

diff --git a/libbcachefs/alloc_background.h b/libbcachefs/alloc_background.h
index 96671f166dd8053a7842fdda13e9afd14e62144b..e7f7e842ee1b725f1373e4782cc34e1c9b83afa7 100644 (file)
--- a/libbcachefs/alloc_background.h
+++ b/libbcachefs/alloc_background.h
@@ -182,24 +182,21 @@ void bch2_alloc_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 #define bch2_bkey_ops_alloc ((struct bkey_ops) {       \
        .key_invalid    = bch2_alloc_v1_invalid,        \
        .val_to_text    = bch2_alloc_to_text,           \
-       .trans_trigger  = bch2_trans_mark_alloc,        \
-       .atomic_trigger = bch2_mark_alloc,              \
+       .trigger        = bch2_trigger_alloc,           \
        .min_val_size   = 8,                            \
 })
 
 #define bch2_bkey_ops_alloc_v2 ((struct bkey_ops) {    \
        .key_invalid    = bch2_alloc_v2_invalid,        \
        .val_to_text    = bch2_alloc_to_text,           \
-       .trans_trigger  = bch2_trans_mark_alloc,        \
-       .atomic_trigger = bch2_mark_alloc,              \
+       .trigger        = bch2_trigger_alloc,           \
        .min_val_size   = 8,                            \
 })
 
 #define bch2_bkey_ops_alloc_v3 ((struct bkey_ops) {    \
        .key_invalid    = bch2_alloc_v3_invalid,        \
        .val_to_text    = bch2_alloc_to_text,           \
-       .trans_trigger  = bch2_trans_mark_alloc,        \
-       .atomic_trigger = bch2_mark_alloc,              \
+       .trigger        = bch2_trigger_alloc,           \
        .min_val_size   = 16,                           \
 })
 
@@ -207,8 +204,7 @@ void bch2_alloc_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
        .key_invalid    = bch2_alloc_v4_invalid,        \
        .val_to_text    = bch2_alloc_to_text,           \
        .swab           = bch2_alloc_v4_swab,           \
-       .trans_trigger  = bch2_trans_mark_alloc,        \
-       .atomic_trigger = bch2_mark_alloc,              \
+       .trigger        = bch2_trigger_alloc,           \
        .min_val_size   = 48,                           \
 })
 
@@ -232,8 +228,8 @@ static inline bool bkey_is_alloc(const struct bkey *k)
 
 int bch2_alloc_read(struct bch_fs *);
 
-int bch2_trans_mark_alloc(struct btree_trans *, enum btree_id, unsigned,
-                         struct bkey_s_c, struct bkey_i *, unsigned);
+int bch2_trigger_alloc(struct btree_trans *, enum btree_id, unsigned,
+                      struct bkey_s_c, struct bkey_s, unsigned);
 int bch2_check_alloc_info(struct bch_fs *);
 int bch2_check_alloc_to_lru_refs(struct bch_fs *);
 void bch2_do_discards(struct bch_fs *);