Update bcachefs sources to 50847e296b34 bcachefs: Check subvol <-> inode pointers...

[bcachefs-tools-debian] / libbcachefs / keylist.h

diff --git a/libbcachefs/keylist.h b/libbcachefs/keylist.h
index a7ff86b08abcd008f96b5f5b976812bab3fe20e2..e687e0e9aede1cb2f7bb7252d16d58ec2774ebd1 100644 (file)
--- a/libbcachefs/keylist.h
+++ b/libbcachefs/keylist.h
@@ -5,7 +5,6 @@
 #include "keylist_types.h"
 
 int bch2_keylist_realloc(struct keylist *, u64 *, size_t, size_t);
-void bch2_keylist_add_in_order(struct keylist *, struct bkey_i *);
 void bch2_keylist_pop_front(struct keylist *);
 
 static inline void bch2_keylist_init(struct keylist *l, u64 *inline_keys)
@@ -17,7 +16,6 @@ static inline void bch2_keylist_free(struct keylist *l, u64 *inline_keys)
 {
        if (l->keys_p != inline_keys)
                kfree(l->keys_p);
-       bch2_keylist_init(l, inline_keys);
 }
 
 static inline void bch2_keylist_push(struct keylist *l)
@@ -36,14 +34,14 @@ static inline bool bch2_keylist_empty(struct keylist *l)
        return l->top == l->keys;
 }
 
-static inline size_t bch_keylist_u64s(struct keylist *l)
+static inline size_t bch2_keylist_u64s(struct keylist *l)
 {
        return l->top_p - l->keys_p;
 }
 
 static inline size_t bch2_keylist_bytes(struct keylist *l)
 {
-       return bch_keylist_u64s(l) * sizeof(u64);
+       return bch2_keylist_u64s(l) * sizeof(u64);
 }
 
 static inline struct bkey_i *bch2_keylist_front(struct keylist *l)
@@ -52,18 +50,16 @@ static inline struct bkey_i *bch2_keylist_front(struct keylist *l)
 }
 
 #define for_each_keylist_key(_keylist, _k)                     \
-       for (_k = (_keylist)->keys;                             \
+       for (struct bkey_i *_k = (_keylist)->keys;              \
             _k != (_keylist)->top;                             \
             _k = bkey_next(_k))
 
 static inline u64 keylist_sectors(struct keylist *keys)
 {
-       struct bkey_i *k;
        u64 ret = 0;
 
        for_each_keylist_key(keys, k)
                ret += k->k.size;
-
        return ret;
 }