diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-12-28 00:21:04 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-05 23:24:19 -0500 |
| commit | 282e7c37ebf5d76c4f38d6656354901919a2592f (patch) | |
| tree | fe199d25ccf302b987eeb423083c0a9bb0ab0007 | |
| parent | c95e9ec48682425267e682e5489ee9dc42313335 (diff) | |
| download | linux-stable-282e7c37ebf5d76c4f38d6656354901919a2592f.tar.gz linux-stable-282e7c37ebf5d76c4f38d6656354901919a2592f.tar.bz2 linux-stable-282e7c37ebf5d76c4f38d6656354901919a2592f.zip | |
bcachefs: kill mem_trigger_run_overwrite_then_insert()
now that type signatures are unified, redundant
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/buckets.c | 4 | ||||
| -rw-r--r-- | fs/bcachefs/buckets.h | 5 | ||||
| -rw-r--r-- | fs/bcachefs/reflink.c | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c index 7099a7db58a8..233590cff14e 100644 --- a/fs/bcachefs/buckets.c +++ b/fs/bcachefs/buckets.c @@ -1011,7 +1011,7 @@ int bch2_mark_extent(struct btree_trans *trans, struct bkey_s_c old, struct bkey_s new, unsigned flags) { - return mem_trigger_run_overwrite_then_insert(__mark_extent, trans, btree_id, level, old, new, flags); + return trigger_run_overwrite_then_insert(__mark_extent, trans, btree_id, level, old, new, flags); } int bch2_mark_stripe(struct btree_trans *trans, @@ -1157,7 +1157,7 @@ int bch2_mark_reservation(struct btree_trans *trans, struct bkey_s_c old, struct bkey_s new, unsigned flags) { - return mem_trigger_run_overwrite_then_insert(__mark_reservation, trans, btree_id, level, old, new, flags); + return trigger_run_overwrite_then_insert(__mark_reservation, trans, btree_id, level, old, new, flags); } void bch2_trans_fs_usage_revert(struct btree_trans *trans, diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h index de1a28dd0e07..c2ffa1bd57b6 100644 --- a/fs/bcachefs/buckets.h +++ b/fs/bcachefs/buckets.h @@ -339,7 +339,7 @@ int bch2_mark_reservation(struct btree_trans *, enum btree_id, unsigned, int bch2_trans_mark_extent(struct btree_trans *, enum btree_id, unsigned, struct bkey_s_c, struct bkey_s, unsigned); int bch2_trans_mark_stripe(struct btree_trans *, enum btree_id, unsigned, struct bkey_s_c, struct bkey_s, unsigned); int bch2_trans_mark_reservation(struct btree_trans *, enum btree_id, unsigned, struct bkey_s_c, struct bkey_s, unsigned); -#define mem_trigger_run_overwrite_then_insert(_fn, _trans, _btree_id, _level, _old, _new, _flags)\ +#define trigger_run_overwrite_then_insert(_fn, _trans, _btree_id, _level, _old, _new, _flags)\ ({ \ int ret = 0; \ \ @@ -350,9 +350,6 @@ int bch2_trans_mark_reservation(struct btree_trans *, enum btree_id, unsigned, s ret; \ }) -#define trigger_run_overwrite_then_insert(_fn, _trans, _btree_id, _level, _old, _new, _flags) \ - mem_trigger_run_overwrite_then_insert(_fn, _trans, _btree_id, _level, _old, _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 *); diff --git a/fs/bcachefs/reflink.c b/fs/bcachefs/reflink.c index 5c1ae3be8e48..1499356f2d13 100644 --- a/fs/bcachefs/reflink.c +++ b/fs/bcachefs/reflink.c @@ -271,7 +271,7 @@ int bch2_mark_reflink_p(struct btree_trans *trans, struct bkey_s_c old, struct bkey_s new, unsigned flags) { - return mem_trigger_run_overwrite_then_insert(__mark_reflink_p, trans, btree_id, level, old, new, flags); + return trigger_run_overwrite_then_insert(__mark_reflink_p, trans, btree_id, level, old, new, flags); } /* indirect extents */ |