bcachefs: kill __bch2_btree_iter_peek_upto_and_restart()

dead code

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 72da7bedbe50462fe538c75efbfbb5be747658d4..79e6ec7b9a5271b4964d73c1bcfcf41de8e9b054 100644 (file)
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -2285,7 +2285,7 @@ struct bkey_s_c bch2_btree_iter_peek_prev(struct btree_iter *iter)
                                        goto got_key;
                                }
 
-                               if (bch2_snapshot_is_ancestor(iter->trans->c,
+                               if (bch2_snapshot_is_ancestor(trans->c,
                                                              iter->snapshot,
                                                              k.k->p.snapshot)) {
                                        if (saved_path)

diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h
index 4a16214b1e6b75740368d6cf2f95dae7d7e4b1a8..29f02335642e9c1684e5593446d046439c17c584 100644 (file)
--- a/fs/bcachefs/btree_iter.h
+++ b/fs/bcachefs/btree_iter.h
@@ -623,38 +623,6 @@ static inline int btree_trans_too_many_iters(struct btree_trans *trans)
        return 0;
 }
 
-struct bkey_s_c bch2_btree_iter_peek_and_restart_outlined(struct btree_iter *);
-
-static inline struct bkey_s_c
-__bch2_btree_iter_peek_and_restart(struct btree_trans *trans,
-                                  struct btree_iter *iter, unsigned flags)
-{
-       struct bkey_s_c k;
-
-       while (btree_trans_too_many_iters(trans) ||
-              (k = bch2_btree_iter_peek_type(iter, flags),
-               bch2_err_matches(bkey_err(k), BCH_ERR_transaction_restart)))
-               bch2_trans_begin(trans);
-
-       return k;
-}
-
-static inline struct bkey_s_c
-__bch2_btree_iter_peek_upto_and_restart(struct btree_trans *trans,
-                                       struct btree_iter *iter,
-                                       struct bpos end,
-                                       unsigned flags)
-{
-       struct bkey_s_c k;
-
-       while (btree_trans_too_many_iters(trans) ||
-              (k = bch2_btree_iter_peek_upto_type(iter, end, flags),
-               bch2_err_matches(bkey_err(k), BCH_ERR_transaction_restart)))
-               bch2_trans_begin(trans);
-
-       return k;
-}
-
 /*
  * goto instead of loop, so that when used inside for_each_btree_key2()
  * break/continue work correctly
@@ -780,6 +748,22 @@ transaction_restart:                                                       \
                            (_do) ?: bch2_trans_commit(_trans, (_disk_res),\
                                        (_journal_seq), (_commit_flags)))
 
+struct bkey_s_c bch2_btree_iter_peek_and_restart_outlined(struct btree_iter *);
+
+static inline struct bkey_s_c
+__bch2_btree_iter_peek_and_restart(struct btree_trans *trans,
+                                  struct btree_iter *iter, unsigned flags)
+{
+       struct bkey_s_c k;
+
+       while (btree_trans_too_many_iters(trans) ||
+              (k = bch2_btree_iter_peek_type(iter, flags),
+               bch2_err_matches(bkey_err(k), BCH_ERR_transaction_restart)))
+               bch2_trans_begin(trans);
+
+       return k;
+}
+
 #define for_each_btree_key_old(_trans, _iter, _btree_id,               \
                           _start, _flags, _k, _ret)                    \
        for (bch2_trans_iter_init((_trans), &(_iter), (_btree_id),      \
@@ -841,8 +825,6 @@ transaction_restart:                                                        \
        _p;                                                             \
 })
 
-/* new multiple iterator interface: */
-
 void bch2_trans_updates_to_text(struct printbuf *, struct btree_trans *);
 void bch2_btree_path_to_text(struct printbuf *, struct btree_path *);
 void bch2_trans_paths_to_text(struct printbuf *, struct btree_trans *);