bcachefs: Improve __bch2_btree_path_make_mut()
authorKent Overstreet <kent.overstreet@linux.dev>
Tue, 1 Nov 2022 08:23:24 +0000 (04:23 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:09:45 +0000 (17:09 -0400)
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 <kent.overstreet@linux.dev>
fs/bcachefs/btree_iter.c

index 4a9476e..d30fb32 100644 (file)
@@ -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;
 }