bcachefs: kill bch2_btree_iter_peek_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 c71efbdb3f07219ed3f29d1fd60f29e915151484..bfe9f0c1e1be8e3c97fb22c740ff57748c9cb1f9 100644 (file)
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -2726,6 +2726,7 @@ struct bkey_s_c bch2_btree_iter_prev_slot(struct btree_iter *iter)
        return bch2_btree_iter_peek_slot(iter);
 }
 
+/* Obsolete, but still used by rust wrapper in -tools */
 struct bkey_s_c bch2_btree_iter_peek_and_restart_outlined(struct btree_iter *iter)
 {
        struct bkey_s_c k;

diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h
index 172507b4deaddd6626390d47e9756829f5be43b2..2ad90f40325ad009041ee403d66f0b9d292d50f3 100644 (file)
--- a/fs/bcachefs/btree_iter.h
+++ b/fs/bcachefs/btree_iter.h
@@ -832,20 +832,6 @@ transaction_restart:                                                       \
 
 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_upto_norestart(_trans, _iter, _btree_id,    \
                           _start, _end, _flags, _k, _ret)              \
        for (bch2_trans_iter_init((_trans), &(_iter), (_btree_id),      \