diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-12-31 21:01:06 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-05 23:24:20 -0500 |
| commit | f0431c5f474643a0dbe9f3c288480422abd16179 (patch) | |
| tree | 56356bf74743c1aa3b28908646949bd0e3b334df /fs/bcachefs/extents.h | |
| parent | 4f9ec59f8fd658d832460aa25c145bdecfdbaa2d (diff) | |
| download | linux-f0431c5f474643a0dbe9f3c288480422abd16179.tar.gz linux-f0431c5f474643a0dbe9f3c288480422abd16179.tar.bz2 linux-f0431c5f474643a0dbe9f3c288480422abd16179.zip | |
bcachefs: Combine .trans_trigger, .atomic_trigger
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/extents.h')
| -rw-r--r-- | fs/bcachefs/extents.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/bcachefs/extents.h b/fs/bcachefs/extents.h index b59a8b1c4678..a855c94d43dd 100644 --- a/fs/bcachefs/extents.h +++ b/fs/bcachefs/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_trigger_extent, \ - .atomic_trigger = bch2_trigger_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_trigger_extent, \ - .atomic_trigger = bch2_trigger_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_trigger_extent, \ - .atomic_trigger = bch2_trigger_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_trigger_reservation, \ - .atomic_trigger = bch2_trigger_reservation, \ + .trigger = bch2_trigger_reservation, \ .min_val_size = 8, \ }) |