X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libbcachefs%2Fkeylist.h;h=fe759c7031e0403a0fe0da6d61b2c8432f819451;hb=3bd4653767bb5eadd253e382fe8503ceb6bef5d1;hp=a8c8883ba0719ae736bcb17370de00d7d18322df;hpb=807abf36c1e119825d42cda6f6b249649ca44eb5;p=bcachefs-tools-debian

diff --git a/libbcachefs/keylist.h b/libbcachefs/keylist.h
index a8c8883..fe759c7 100644
--- a/libbcachefs/keylist.h
+++ b/libbcachefs/keylist.h
@@ -1,10 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHEFS_KEYLIST_H
 #define _BCACHEFS_KEYLIST_H
 
 #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)
@@ -16,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)
@@ -35,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)
@@ -55,9 +54,6 @@ static inline struct bkey_i *bch2_keylist_front(struct keylist *l)
 	     _k != (_keylist)->top;				\
 	     _k = bkey_next(_k))
 
-#define keylist_single(k)					\
-	((struct keylist) { .keys = k, .top = bkey_next(k) })
-
 static inline u64 keylist_sectors(struct keylist *keys)
 {
 	struct bkey_i *k;