tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
bcachefs: kill for_each_btree_key_norestart()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+8
-20
+8
-20
fs/bcachefs/btree_iter.h
+8
-20
fs/bcachefs/btree_iter.h
···
784
784
!((_ret) = bkey_err(_k)) && (_k).k; \
785
785
bch2_btree_iter_advance(&(_iter)))
786
786
787
-
#define for_each_btree_key_norestart(_trans, _iter, _btree_id, \
788
-
_start, _flags, _k, _ret) \
789
-
for (bch2_trans_iter_init((_trans), &(_iter), (_btree_id), \
790
-
(_start), (_flags)); \
791
-
(_k) = bch2_btree_iter_peek_type(&(_iter), _flags), \
792
-
!((_ret) = bkey_err(_k)) && (_k).k; \
793
-
bch2_btree_iter_advance(&(_iter)))
794
-
795
787
#define for_each_btree_key_upto_norestart(_trans, _iter, _btree_id, \
796
788
_start, _end, _flags, _k, _ret) \
797
789
for (bch2_trans_iter_init((_trans), &(_iter), (_btree_id), \
···
792
800
!((_ret) = bkey_err(_k)) && (_k).k; \
793
801
bch2_btree_iter_advance(&(_iter)))
794
802
795
-
#define for_each_btree_key_continue(_trans, _iter, _flags, _k, _ret) \
796
-
for (; \
797
-
(_k) = __bch2_btree_iter_peek_and_restart((_trans), &(_iter), _flags),\
798
-
!((_ret) = bkey_err(_k)) && (_k).k; \
799
-
bch2_btree_iter_advance(&(_iter)))
800
-
801
-
#define for_each_btree_key_continue_norestart(_iter, _flags, _k, _ret) \
802
-
for (; \
803
-
(_k) = bch2_btree_iter_peek_type(&(_iter), _flags), \
804
-
!((_ret) = bkey_err(_k)) && (_k).k; \
805
-
bch2_btree_iter_advance(&(_iter)))
806
-
807
803
#define for_each_btree_key_upto_continue_norestart(_iter, _end, _flags, _k, _ret)\
808
804
for (; \
809
805
(_k) = bch2_btree_iter_peek_upto_type(&(_iter), _end, _flags), \
810
806
!((_ret) = bkey_err(_k)) && (_k).k; \
811
807
bch2_btree_iter_advance(&(_iter)))
808
+
809
+
#define for_each_btree_key_norestart(_trans, _iter, _btree_id, \
810
+
_start, _flags, _k, _ret) \
811
+
for_each_btree_key_upto_norestart(_trans, _iter, _btree_id, _start,\
812
+
SPOS_MAX, _flags, _k, _ret)
813
+
814
+
#define for_each_btree_key_continue_norestart(_iter, _flags, _k, _ret) \
815
+
for_each_btree_key_upto_continue_norestart(_iter, SPOS_MAX, _flags, _k, _ret)
812
816
813
817
#define drop_locks_do(_trans, _do) \
814
818
({ \