diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-02 06:14:31 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:09:55 +0300 |
| commit | 2611a041ae9c35b1bf4e7e1462c77c4096490a4e (patch) | |
| tree | 51ae81e238c8e0a9d3ca52239f4d3d27d4ce684c /fs/bcachefs/bkey_methods.h | |
| parent | e902095868819c23433c6eba6636e2f1122da126 (diff) | |
| download | linux-2611a041ae9c35b1bf4e7e1462c77c4096490a4e.tar.xz | |
bcachefs: bch2_mark_key() now takes btree_id & level
btree & level are passed to trans_mark - for backpointers -
bch2_mark_key() should take them as well.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/bkey_methods.h')
| -rw-r--r-- | fs/bcachefs/bkey_methods.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/bcachefs/bkey_methods.h b/fs/bcachefs/bkey_methods.h index 9a6afab87f6c..6ae517884a37 100644 --- a/fs/bcachefs/bkey_methods.h +++ b/fs/bcachefs/bkey_methods.h @@ -29,8 +29,8 @@ struct bkey_ops { bool (*key_merge)(struct bch_fs *, struct bkey_s, struct bkey_s_c); int (*trans_trigger)(struct btree_trans *, enum btree_id, unsigned, struct bkey_s_c, struct bkey_i *, unsigned); - int (*atomic_trigger)(struct btree_trans *, struct bkey_s_c, - struct bkey_s_c, unsigned); + int (*atomic_trigger)(struct btree_trans *, enum btree_id, unsigned, + struct bkey_s_c, struct bkey_s_c, unsigned); void (*compat)(enum btree_id id, unsigned version, unsigned big_endian, int write, struct bkey_s); @@ -68,14 +68,14 @@ static inline bool bch2_bkey_maybe_mergable(const struct bkey *l, const struct b bool bch2_bkey_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c); static inline int bch2_mark_key(struct btree_trans *trans, - struct bkey_s_c old, - struct bkey_s_c new, - unsigned flags) + enum btree_id btree, unsigned level, + struct bkey_s_c old, struct bkey_s_c new, + unsigned flags) { const struct bkey_ops *ops = &bch2_bkey_ops[old.k->type ?: new.k->type]; return ops->atomic_trigger - ? ops->atomic_trigger(trans, old, new, flags) + ? ops->atomic_trigger(trans, btree, level, old, new, flags) : 0; } |