Update bcachefs sources to e7f6215768 bcachefs: Fix snapshot_skiplist_good()

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

diff --git a/libbcachefs/keylist.c b/libbcachefs/keylist.c
index 51dd7edc29009a3186080ad8d25e9b67cec5c1f2..5699cd4873c81d3c393aa59f339c328b051f90b8 100644 (file)
--- a/libbcachefs/keylist.c
+++ b/libbcachefs/keylist.c
@@ -1,11 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include "bcachefs.h"
+#include "bkey.h"
 #include "keylist.h"
 
 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;
@@ -16,7 +18,7 @@ int bch2_keylist_realloc(struct keylist *l, u64 *inline_u64s,
            (old_buf && roundup_pow_of_two(oldsize) == newsize))
                return 0;
 
-       new_keys = krealloc(old_buf, sizeof(u64) * newsize, GFP_NOIO);
+       new_keys = krealloc(old_buf, sizeof(u64) * newsize, GFP_NOFS);
        if (!new_keys)
                return -ENOMEM;
 
@@ -29,27 +31,22 @@ int bch2_keylist_realloc(struct keylist *l, u64 *inline_u64s,
        return 0;
 }
 
-void bch2_keylist_add_in_order(struct keylist *l, struct bkey_i *insert)
-{
-       struct bkey_i *where;
-
-       for_each_keylist_key(l, where)
-               if (bkey_cmp(insert->k.p, where->k.p) < 0)
-                       break;
-
-       memmove_u64s_up((u64 *) where + insert->k.u64s,
-                       where,
-                       ((u64 *) l->top) - ((u64 *) where));
-
-       l->top_p += insert->k.u64s;
-       bkey_copy(where, insert);
-}
-
 void bch2_keylist_pop_front(struct keylist *l)
 {
        l->top_p -= bch2_keylist_front(l)->k.u64s;
 
        memmove_u64s_down(l->keys,
                          bkey_next(l->keys),
-                         bch_keylist_u64s(l));
+                         bch2_keylist_u64s(l));
+}
+
+#ifdef CONFIG_BCACHEFS_DEBUG
+void bch2_verify_keylist_sorted(struct keylist *l)
+{
+       struct bkey_i *k;
+
+       for_each_keylist_key(l, k)
+               BUG_ON(bkey_next(k) != l->top &&
+                      bpos_ge(k->k.p, bkey_next(k)->k.p));
 }
+#endif