bcachefs: kill for_each_btree_key_old_upto()

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

diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h
index 8e0e579400b5d8d2a09b945d0a72d51af774fb70..f9f6ef9e178f12eb481ff41349843a86f3222676 100644 (file)
--- a/fs/bcachefs/btree_iter.h
+++ b/fs/bcachefs/btree_iter.h
@@ -784,15 +784,6 @@ transaction_restart:                                                       \
             !((_ret) = bkey_err(_k)) && (_k).k;                        \
             bch2_btree_iter_advance(&(_iter)))
 
-#define for_each_btree_key_old_upto(_trans, _iter, _btree_id,          \
-                               _start, _end, _flags, _k, _ret)         \
-       for (bch2_trans_iter_init((_trans), &(_iter), (_btree_id),      \
-                                 (_start), (_flags));                  \
-            (_k) = __bch2_btree_iter_peek_upto_and_restart((_trans),   \
-                                               &(_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 (bch2_trans_iter_init((_trans), &(_iter), (_btree_id),      \

diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
index c3c0b9c1dba26290dc849f1bfb4159240c8456f9..3e66f244a67e773b88f4e83250d257fdfebd51af 100644 (file)
--- a/fs/bcachefs/fsck.c
+++ b/fs/bcachefs/fsck.c
@@ -30,16 +30,15 @@ static s64 bch2_count_inode_sectors(struct btree_trans *trans, u64 inum,
        struct btree_iter iter;
        struct bkey_s_c k;
        u64 sectors = 0;
-       int ret;
 
-       for_each_btree_key_old_upto(trans, iter, BTREE_ID_extents,
-                                   SPOS(inum, 0, snapshot),
-                                   POS(inum, U64_MAX),
-                                   0, k, ret)
+       int ret = for_each_btree_key_upto(trans, iter, BTREE_ID_extents,
+                               SPOS(inum, 0, snapshot),
+                               POS(inum, U64_MAX),
+                               0, k, ({
                if (bkey_extent_is_allocation(k.k))
                        sectors += k.k->size;
-
-       bch2_trans_iter_exit(trans, &iter);
+               0;
+       }));
 
        return ret ?: sectors;
 }
@@ -49,22 +48,17 @@ static s64 bch2_count_subdirs(struct btree_trans *trans, u64 inum,
 {
        struct btree_iter iter;
        struct bkey_s_c k;
-       struct bkey_s_c_dirent d;
        u64 subdirs = 0;
-       int ret;
 
-       for_each_btree_key_old_upto(trans, iter, BTREE_ID_dirents,
+       int ret = for_each_btree_key_upto(trans, iter, BTREE_ID_dirents,
                                    SPOS(inum, 0, snapshot),
                                    POS(inum, U64_MAX),
-                                   0, k, ret) {
-               if (k.k->type != KEY_TYPE_dirent)
-                       continue;
-
-               d = bkey_s_c_to_dirent(k);
-               if (d.v->d_type == DT_DIR)
+                                   0, k, ({
+               if (k.k->type == KEY_TYPE_dirent &&
+                   bkey_s_c_to_dirent(k).v->d_type == DT_DIR)
                        subdirs++;
-       }
-       bch2_trans_iter_exit(trans, &iter);
+               0;
+       }));
 
        return ret ?: subdirs;
 }