diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-24 11:34:07 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-24 11:34:07 -0400 |
| commit | 980f7437e2588d100456640cb863908a3cc6fc77 (patch) | |
| tree | ac19bcb02929770909af3bb6dd44a95da915c0e4 /libbcachefs/btree_iter.c | |
| parent | ae43a58d97fc00e31770142da832fb8a249808eb (diff) | |
Update bcachefs sources to 61ebcb532a bcachefs: Fix for allocating before backpointers have been checked
Diffstat (limited to 'libbcachefs/btree_iter.c')
| -rw-r--r-- | libbcachefs/btree_iter.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libbcachefs/btree_iter.c b/libbcachefs/btree_iter.c index da116153..99a92a89 100644 --- a/libbcachefs/btree_iter.c +++ b/libbcachefs/btree_iter.c @@ -1222,19 +1222,15 @@ struct btree_path *__bch2_btree_path_make_mut(struct btree_trans *trans, } struct btree_path * __must_check -bch2_btree_path_set_pos(struct btree_trans *trans, +__bch2_btree_path_set_pos(struct btree_trans *trans, struct btree_path *path, struct bpos new_pos, - bool intent, unsigned long ip) + bool intent, unsigned long ip, int cmp) { - int cmp = bpos_cmp(new_pos, path->pos); unsigned l = path->level; EBUG_ON(trans->restarted); EBUG_ON(!path->ref); - if (!cmp) - return path; - path = bch2_btree_path_make_mut(trans, path, intent, ip); path->pos = new_pos; |