From 984dc67e3bceb8871444961df0d2c2a45d5a3f4e Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Tue, 1 Nov 2022 04:23:24 -0400 Subject: [PATCH] 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: Kent Overstreet --- fs/bcachefs/btree_iter.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 4a9476e8399ef..d30fb32bb6839 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -1175,8 +1175,6 @@ static inline void btree_path_copy(struct btree_trans *trans, struct btree_path if (t != BTREE_NODE_UNLOCKED) 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, @@ -1196,10 +1194,6 @@ struct btree_path *__bch2_btree_path_make_mut(struct btree_trans *trans, __btree_path_put(path, intent); path = btree_path_clone(trans, path, intent); path->preserve = false; -#ifdef CONFIG_BCACHEFS_DEBUG - path->ip_allocated = _RET_IP_; -#endif - path->should_be_locked = false; return path; } -- 2.30.2