Update bcachefs sources to 1bda24d7cc fixup! bcachefs: for_each_btree_key2()

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

diff --git a/libbcachefs/keylist.c b/libbcachefs/keylist.c
index 5da54ced9cadb736a1edf22e77ddf81b9292f6fd..cda77835b9ea62381f3962a1d0029d463fe3b2b1 100644 (file)
--- a/libbcachefs/keylist.c
+++ b/libbcachefs/keylist.c
@@ -6,7 +6,7 @@
 int bch2_keylist_realloc(struct keylist *l, u64 *inline_u64s,
                        size_t nr_inline_u64s, size_t new_u64s)
 {
-       size_t oldsize = bch_keylist_u64s(l);
+       size_t oldsize = bch2_keylist_u64s(l);
        size_t newsize = oldsize + new_u64s;
        u64 *old_buf = l->keys_p == inline_u64s ? NULL : l->keys_p;
        u64 *new_keys;
@@ -52,7 +52,7 @@ void bch2_keylist_pop_front(struct keylist *l)
 
        memmove_u64s_down(l->keys,
                          bkey_next(l->keys),
-                         bch_keylist_u64s(l));
+                         bch2_keylist_u64s(l));
 }
 
 #ifdef CONFIG_BCACHEFS_DEBUG
@@ -62,6 +62,6 @@ void bch2_verify_keylist_sorted(struct keylist *l)
 
        for_each_keylist_key(l, k)
                BUG_ON(bkey_next(k) != l->top &&
-                      bkey_cmp(k->k.p, bkey_next(k)->k.p) >= 0);
+                      bpos_cmp(k->k.p, bkey_next(k)->k.p) >= 0);
 }
 #endif