diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-07-17 11:42:11 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-08-22 02:07:25 -0400 |
| commit | ff43ba1eb561f3b9257fcef3606919b49863bbdb (patch) | |
| tree | 17e5fd66db5f1a343c1ec0c9198c6f16e33da67e | |
| parent | 5f58bb0f5e17e2b2b1cd104a2e26d99cbcdda07f (diff) | |
bcachefs: kill bch2_btree_iter_peek_and_restart()
dead code
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 1 | ||||
| -rw-r--r-- | fs/bcachefs/btree_iter.h | 14 |
2 files changed, 1 insertions, 14 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index c71efbdb3f07..bfe9f0c1e1be 100644 --- 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 172507b4dead..2ad90f40325a 100644 --- 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), \ |