bcachefs: kill for_each_btree_key_norestart()

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

diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h
index f9f6ef9e178f12eb481ff41349843a86f3222676..ac96f857016981708fbe23af08666cf863bc6e9b 100644 (file)
--- a/fs/bcachefs/btree_iter.h
+++ b/fs/bcachefs/btree_iter.h
@@ -784,14 +784,6 @@ transaction_restart:                                                       \
             !((_ret) = bkey_err(_k)) && (_k).k;                        \
             bch2_btree_iter_advance(&(_iter)))
 
-#define for_each_btree_key_norestart(_trans, _iter, _btree_id,         \
-                          _start, _flags, _k, _ret)                    \
-       for (bch2_trans_iter_init((_trans), &(_iter), (_btree_id),      \
-                                 (_start), (_flags));                  \
-            (_k) = bch2_btree_iter_peek_type(&(_iter), _flags),        \
-            !((_ret) = bkey_err(_k)) && (_k).k;                        \
-            bch2_btree_iter_advance(&(_iter)))
-
 #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),      \
@@ -800,24 +792,20 @@ transaction_restart:                                                      \
             !((_ret) = bkey_err(_k)) && (_k).k;                        \
             bch2_btree_iter_advance(&(_iter)))
 
-#define for_each_btree_key_continue(_trans, _iter, _flags, _k, _ret)   \
-       for (;                                                          \
-            (_k) = __bch2_btree_iter_peek_and_restart((_trans), &(_iter), _flags),\
-            !((_ret) = bkey_err(_k)) && (_k).k;                        \
-            bch2_btree_iter_advance(&(_iter)))
-
-#define for_each_btree_key_continue_norestart(_iter, _flags, _k, _ret) \
-       for (;                                                          \
-            (_k) = bch2_btree_iter_peek_type(&(_iter), _flags),        \
-            !((_ret) = bkey_err(_k)) && (_k).k;                        \
-            bch2_btree_iter_advance(&(_iter)))
-
 #define for_each_btree_key_upto_continue_norestart(_iter, _end, _flags, _k, _ret)\
        for (;                                                                  \
             (_k) = bch2_btree_iter_peek_upto_type(&(_iter), _end, _flags),     \
             !((_ret) = bkey_err(_k)) && (_k).k;                                \
             bch2_btree_iter_advance(&(_iter)))
 
+#define for_each_btree_key_norestart(_trans, _iter, _btree_id,         \
+                          _start, _flags, _k, _ret)                    \
+       for_each_btree_key_upto_norestart(_trans, _iter, _btree_id, _start,\
+                                         SPOS_MAX, _flags, _k, _ret)
+
+#define for_each_btree_key_continue_norestart(_iter, _flags, _k, _ret) \
+       for_each_btree_key_upto_continue_norestart(_iter, SPOS_MAX, _flags, _k, _ret)
+
 #define drop_locks_do(_trans, _do)                                     \
 ({                                                                     \
        bch2_trans_unlock(_trans);                                      \