Merge tag 'bcachefs-2024-05-19' of https://evilpiepirate.org/git/bcachefs

[linux-2.6-block.git] / fs / bcachefs / bset.h

diff --git a/fs/bcachefs/bset.h b/fs/bcachefs/bset.h
index 120a79fd456bd5ccb50c2608aac4940b63cfeed9..5c6c7a14fa0f485895f58759fd201b54c24b43b3 100644 (file)
--- a/fs/bcachefs/bset.h
+++ b/fs/bcachefs/bset.h
@@ -206,7 +206,10 @@ static inline size_t btree_aux_data_u64s(const struct btree *b)
 }
 
 #define for_each_bset(_b, _t)                                          \
-       for (_t = (_b)->set; _t < (_b)->set + (_b)->nsets; _t++)
+       for (struct bset_tree *_t = (_b)->set; _t < (_b)->set + (_b)->nsets; _t++)
+
+#define for_each_bset_c(_b, _t)                                                \
+       for (const struct bset_tree *_t = (_b)->set; _t < (_b)->set + (_b)->nsets; _t++)
 
 #define bset_tree_for_each_key(_b, _t, _k)                             \
        for (_k = btree_bkey_first(_b, _t);                             \
@@ -294,7 +297,6 @@ static inline struct bset_tree *
 bch2_bkey_to_bset_inlined(struct btree *b, struct bkey_packed *k)
 {
        unsigned offset = __btree_node_key_to_offset(b, k);
-       struct bset_tree *t;
 
        for_each_bset(b, t)
                if (offset <= t->end_offset) {