Commit 984dc67e authored by Kent Overstreet's avatar Kent Overstreet

bcachefs: Improve __bch2_btree_path_make_mut()

btree_path_copy() doesn't need to call
bch2_btree_path_check_sort_fast() - the newly allocated path will always
be in the correct position, post copy; also delete some redundant
branches from __bch2_btree_path_make_mut().
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 0cc455b3
...@@ -1175,8 +1175,6 @@ static inline void btree_path_copy(struct btree_trans *trans, struct btree_path ...@@ -1175,8 +1175,6 @@ static inline void btree_path_copy(struct btree_trans *trans, struct btree_path
if (t != BTREE_NODE_UNLOCKED) if (t != BTREE_NODE_UNLOCKED)
six_lock_increment(&dst->l[i].b->c.lock, t); six_lock_increment(&dst->l[i].b->c.lock, t);
} }
trans->paths_sorted = false;
} }
static struct btree_path *btree_path_clone(struct btree_trans *trans, struct btree_path *src, static struct btree_path *btree_path_clone(struct btree_trans *trans, struct btree_path *src,
...@@ -1196,10 +1194,6 @@ struct btree_path *__bch2_btree_path_make_mut(struct btree_trans *trans, ...@@ -1196,10 +1194,6 @@ struct btree_path *__bch2_btree_path_make_mut(struct btree_trans *trans,
__btree_path_put(path, intent); __btree_path_put(path, intent);
path = btree_path_clone(trans, path, intent); path = btree_path_clone(trans, path, intent);
path->preserve = false; path->preserve = false;
#ifdef CONFIG_BCACHEFS_DEBUG
path->ip_allocated = _RET_IP_;
#endif
path->should_be_locked = false;
return path; return path;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment