Update bcachefs sources to da7d42a9a2 bcachefs: Add new assertions for shutdown path

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

diff --git a/libbcachefs/buckets.h b/libbcachefs/buckets.h
index 400d105fd09165aef446af108a619f1e4b6e2d5b..f9d7dda07ea699d1eb472c55ec743bd10640c507 100644 (file)
--- a/libbcachefs/buckets.h
+++ b/libbcachefs/buckets.h
@@ -274,20 +274,6 @@ 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 *);