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/btree_update_leaf.c | |
| 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/btree_update_leaf.c')
| -rw-r--r-- | fs/bcachefs/btree_update_leaf.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index 0bf4116442f4..de6fedf4bdd0 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -434,7 +434,8 @@ static int run_one_mem_trigger(struct btree_trans *trans, if (bch2_bkey_ops[old.k->type].atomic_trigger == bch2_bkey_ops[i->k->k.type].atomic_trigger && ((1U << old.k->type) & BTREE_TRIGGER_WANTS_OLD_AND_NEW)) { - ret = bch2_mark_key(trans, old, bkey_i_to_s_c(new), + ret = bch2_mark_key(trans, i->btree_id, i->level, + old, bkey_i_to_s_c(new), BTREE_TRIGGER_INSERT|BTREE_TRIGGER_OVERWRITE|flags); } else { struct bkey _deleted = KEY(0, 0, 0); @@ -442,9 +443,11 @@ static int run_one_mem_trigger(struct btree_trans *trans, _deleted.p = i->path->pos; - ret = bch2_mark_key(trans, deleted, bkey_i_to_s_c(new), + ret = bch2_mark_key(trans, i->btree_id, i->level, + deleted, bkey_i_to_s_c(new), BTREE_TRIGGER_INSERT|flags) ?: - bch2_mark_key(trans, old, deleted, + bch2_mark_key(trans, i->btree_id, i->level, + old, deleted, BTREE_TRIGGER_OVERWRITE|flags); } |