Move c_src dirs back to toplevel

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

diff --git a/libbcachefs/extents.h b/libbcachefs/extents.h
index 5f31cbe754c9575a26921a968a23b231e64e0b6a..a855c94d43ddb4f770f69807401f6d9dd5f66cbf 100644 (file)
--- a/libbcachefs/extents.h
+++ b/libbcachefs/extents.h
@@ -415,8 +415,7 @@ void bch2_btree_ptr_v2_compat(enum btree_id, unsigned, unsigned,
        .key_invalid    = bch2_btree_ptr_invalid,               \
        .val_to_text    = bch2_btree_ptr_to_text,               \
        .swab           = bch2_ptr_swab,                        \
-       .trans_trigger  = bch2_trans_mark_extent,               \
-       .atomic_trigger = bch2_mark_extent,                     \
+       .trigger        = bch2_trigger_extent,                  \
 })
 
 #define bch2_bkey_ops_btree_ptr_v2 ((struct bkey_ops) {                \
@@ -424,8 +423,7 @@ void bch2_btree_ptr_v2_compat(enum btree_id, unsigned, unsigned,
        .val_to_text    = bch2_btree_ptr_v2_to_text,            \
        .swab           = bch2_ptr_swab,                        \
        .compat         = bch2_btree_ptr_v2_compat,             \
-       .trans_trigger  = bch2_trans_mark_extent,               \
-       .atomic_trigger = bch2_mark_extent,                     \
+       .trigger        = bch2_trigger_extent,                  \
        .min_val_size   = 40,                                   \
 })
 
@@ -439,8 +437,7 @@ bool bch2_extent_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);
        .swab           = bch2_ptr_swab,                        \
        .key_normalize  = bch2_extent_normalize,                \
        .key_merge      = bch2_extent_merge,                    \
-       .trans_trigger  = bch2_trans_mark_extent,               \
-       .atomic_trigger = bch2_mark_extent,                     \
+       .trigger        = bch2_trigger_extent,                  \
 })
 
 /* KEY_TYPE_reservation: */
@@ -454,8 +451,7 @@ bool bch2_reservation_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);
        .key_invalid    = bch2_reservation_invalid,             \
        .val_to_text    = bch2_reservation_to_text,             \
        .key_merge      = bch2_reservation_merge,               \
-       .trans_trigger  = bch2_trans_mark_reservation,          \
-       .atomic_trigger = bch2_mark_reservation,                \
+       .trigger        = bch2_trigger_reservation,             \
        .min_val_size   = 8,                                    \
 })
 
@@ -566,7 +562,7 @@ static inline struct bch_devs_list bch2_bkey_devs(struct bkey_s_c k)
        struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k);
 
        bkey_for_each_ptr(p, ptr)
-               ret.devs[ret.nr++] = ptr->dev;
+               ret.data[ret.nr++] = ptr->dev;
 
        return ret;
 }
@@ -578,7 +574,7 @@ static inline struct bch_devs_list bch2_bkey_dirty_devs(struct bkey_s_c k)
 
        bkey_for_each_ptr(p, ptr)
                if (!ptr->cached)
-                       ret.devs[ret.nr++] = ptr->dev;
+                       ret.data[ret.nr++] = ptr->dev;
 
        return ret;
 }
@@ -590,7 +586,7 @@ static inline struct bch_devs_list bch2_bkey_cached_devs(struct bkey_s_c k)
 
        bkey_for_each_ptr(p, ptr)
                if (ptr->cached)
-                       ret.devs[ret.nr++] = ptr->dev;
+                       ret.data[ret.nr++] = ptr->dev;
 
        return ret;
 }