Update bcachefs sources to d267e10a43b2 bcachefs: __bch2_sb_field_to_text()

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

diff --git a/libbcachefs/reflink.h b/libbcachefs/reflink.h
index 6cc9c4a77265988081c21aa006ee63a64bfff521..8ee778ec0022a327145eb91ebefbcb38cc1240bf 100644 (file)
--- a/libbcachefs/reflink.h
+++ b/libbcachefs/reflink.h
@@ -9,17 +9,14 @@ int bch2_reflink_p_invalid(struct bch_fs *, struct bkey_s_c,
 void bch2_reflink_p_to_text(struct printbuf *, struct bch_fs *,
                            struct bkey_s_c);
 bool bch2_reflink_p_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);
-int bch2_trans_mark_reflink_p(struct btree_trans *, enum btree_id, unsigned,
-                             struct bkey_s_c, struct bkey_i *, unsigned);
-int bch2_mark_reflink_p(struct btree_trans *, enum btree_id, unsigned,
-                       struct bkey_s_c, struct bkey_s_c, unsigned);
+int bch2_trigger_reflink_p(struct btree_trans *, enum btree_id, unsigned,
+                          struct bkey_s_c, struct bkey_s, unsigned);
 
 #define bch2_bkey_ops_reflink_p ((struct bkey_ops) {           \
        .key_invalid    = bch2_reflink_p_invalid,               \
        .val_to_text    = bch2_reflink_p_to_text,               \
        .key_merge      = bch2_reflink_p_merge,                 \
-       .trans_trigger  = bch2_trans_mark_reflink_p,            \
-       .atomic_trigger = bch2_mark_reflink_p,                  \
+       .trigger        = bch2_trigger_reflink_p,               \
        .min_val_size   = 16,                                   \
 })
 
@@ -28,14 +25,13 @@ int bch2_reflink_v_invalid(struct bch_fs *, struct bkey_s_c,
 void bch2_reflink_v_to_text(struct printbuf *, struct bch_fs *,
                            struct bkey_s_c);
 int bch2_trans_mark_reflink_v(struct btree_trans *, enum btree_id, unsigned,
-                             struct bkey_s_c, struct bkey_i *, unsigned);
+                             struct bkey_s_c, struct bkey_s, unsigned);
 
 #define bch2_bkey_ops_reflink_v ((struct bkey_ops) {           \
        .key_invalid    = bch2_reflink_v_invalid,               \
        .val_to_text    = bch2_reflink_v_to_text,               \
        .swab           = bch2_ptr_swab,                        \
-       .trans_trigger  = bch2_trans_mark_reflink_v,            \
-       .atomic_trigger = bch2_mark_extent,                     \
+       .trigger        = bch2_trans_mark_reflink_v,            \
        .min_val_size   = 8,                                    \
 })
 
@@ -45,13 +41,13 @@ void bch2_indirect_inline_data_to_text(struct printbuf *,
                                struct bch_fs *, struct bkey_s_c);
 int bch2_trans_mark_indirect_inline_data(struct btree_trans *,
                                         enum btree_id, unsigned,
-                             struct bkey_s_c, struct bkey_i *,
+                             struct bkey_s_c, struct bkey_s,
                              unsigned);
 
 #define bch2_bkey_ops_indirect_inline_data ((struct bkey_ops) {        \
        .key_invalid    = bch2_indirect_inline_data_invalid,    \
        .val_to_text    = bch2_indirect_inline_data_to_text,    \
-       .trans_trigger  = bch2_trans_mark_indirect_inline_data, \
+       .trigger        = bch2_trans_mark_indirect_inline_data, \
        .min_val_size   = 8,                                    \
 })
 
@@ -67,13 +63,13 @@ static inline const __le64 *bkey_refcount_c(struct bkey_s_c k)
        }
 }
 
-static inline __le64 *bkey_refcount(struct bkey_i *k)
+static inline __le64 *bkey_refcount(struct bkey_s k)
 {
-       switch (k->k.type) {
+       switch (k.k->type) {
        case KEY_TYPE_reflink_v:
-               return &bkey_i_to_reflink_v(k)->v.refcount;
+               return &bkey_s_to_reflink_v(k).v->refcount;
        case KEY_TYPE_indirect_inline_data:
-               return &bkey_i_to_indirect_inline_data(k)->v.refcount;
+               return &bkey_s_to_indirect_inline_data(k).v->refcount;
        default:
                return NULL;
        }