Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bcachefs: kill __bch2_btree_iter_peek_upto_and_restart()

dead code

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

+17 -35
+1 -1
fs/bcachefs/btree_iter.c
··· 2285 2285 goto got_key; 2286 2286 } 2287 2287 2288 - if (bch2_snapshot_is_ancestor(iter->trans->c, 2288 + if (bch2_snapshot_is_ancestor(trans->c, 2289 2289 iter->snapshot, 2290 2290 k.k->p.snapshot)) { 2291 2291 if (saved_path)
+16 -34
fs/bcachefs/btree_iter.h
··· 623 623 return 0; 624 624 } 625 625 626 - struct bkey_s_c bch2_btree_iter_peek_and_restart_outlined(struct btree_iter *); 627 - 628 - static inline struct bkey_s_c 629 - __bch2_btree_iter_peek_and_restart(struct btree_trans *trans, 630 - struct btree_iter *iter, unsigned flags) 631 - { 632 - struct bkey_s_c k; 633 - 634 - while (btree_trans_too_many_iters(trans) || 635 - (k = bch2_btree_iter_peek_type(iter, flags), 636 - bch2_err_matches(bkey_err(k), BCH_ERR_transaction_restart))) 637 - bch2_trans_begin(trans); 638 - 639 - return k; 640 - } 641 - 642 - static inline struct bkey_s_c 643 - __bch2_btree_iter_peek_upto_and_restart(struct btree_trans *trans, 644 - struct btree_iter *iter, 645 - struct bpos end, 646 - unsigned flags) 647 - { 648 - struct bkey_s_c k; 649 - 650 - while (btree_trans_too_many_iters(trans) || 651 - (k = bch2_btree_iter_peek_upto_type(iter, end, flags), 652 - bch2_err_matches(bkey_err(k), BCH_ERR_transaction_restart))) 653 - bch2_trans_begin(trans); 654 - 655 - return k; 656 - } 657 - 658 626 /* 659 627 * goto instead of loop, so that when used inside for_each_btree_key2() 660 628 * break/continue work correctly ··· 748 780 (_do) ?: bch2_trans_commit(_trans, (_disk_res),\ 749 781 (_journal_seq), (_commit_flags))) 750 782 783 + struct bkey_s_c bch2_btree_iter_peek_and_restart_outlined(struct btree_iter *); 784 + 785 + static inline struct bkey_s_c 786 + __bch2_btree_iter_peek_and_restart(struct btree_trans *trans, 787 + struct btree_iter *iter, unsigned flags) 788 + { 789 + struct bkey_s_c k; 790 + 791 + while (btree_trans_too_many_iters(trans) || 792 + (k = bch2_btree_iter_peek_type(iter, flags), 793 + bch2_err_matches(bkey_err(k), BCH_ERR_transaction_restart))) 794 + bch2_trans_begin(trans); 795 + 796 + return k; 797 + } 798 + 751 799 #define for_each_btree_key_old(_trans, _iter, _btree_id, \ 752 800 _start, _flags, _k, _ret) \ 753 801 for (bch2_trans_iter_init((_trans), &(_iter), (_btree_id), \ ··· 824 840 } \ 825 841 _p; \ 826 842 }) 827 - 828 - /* new multiple iterator interface: */ 829 843 830 844 void bch2_trans_updates_to_text(struct printbuf *, struct btree_trans *); 831 845 void bch2_btree_path_to_text(struct printbuf *, struct btree_path *);