Update bcachefs sources to 33a60d9b05 bcachefs: Assorted fixes for clang

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

diff --git a/libbcachefs/alloc_background.c b/libbcachefs/alloc_background.c
index 8d8481fc1ecce4563a2c708e37cd76f65f35760c..7bf2a50653eb70629a380edf5daefb2310eb64df 100644 (file)
--- a/libbcachefs/alloc_background.c
+++ b/libbcachefs/alloc_background.c
@@ -79,36 +79,6 @@ static inline u64 alloc_field_v1_get(const struct bch_alloc *a,
        return v;
 }
 
-static inline void alloc_field_v1_put(struct bkey_i_alloc *a, void **p,
-                                     unsigned field, u64 v)
-{
-       unsigned bytes = BCH_ALLOC_V1_FIELD_BYTES[field];
-
-       if (!v)
-               return;
-
-       a->v.fields |= 1 << field;
-
-       switch (bytes) {
-       case 1:
-               *((u8 *) *p) = v;
-               break;
-       case 2:
-               *((__le16 *) *p) = cpu_to_le16(v);
-               break;
-       case 4:
-               *((__le32 *) *p) = cpu_to_le32(v);
-               break;
-       case 8:
-               *((__le64 *) *p) = cpu_to_le64(v);
-               break;
-       default:
-               BUG();
-       }
-
-       *p += bytes;
-}
-
 static void bch2_alloc_unpack_v1(struct bkey_alloc_unpacked *out,
                                 struct bkey_s_c k)
 {
@@ -267,7 +237,8 @@ int bch2_alloc_v3_invalid(const struct bch_fs *c, struct bkey_s_c k,
 }
 
 int bch2_alloc_v4_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                         unsigned flags, struct printbuf *err)
+                         enum bkey_invalid_flags flags,
+                         struct printbuf *err)
 {
        struct bkey_s_c_alloc_v4 a = bkey_s_c_to_alloc_v4(k);
        int rw = flags & WRITE;
@@ -1334,7 +1305,7 @@ static int bch2_check_discard_freespace_key(struct btree_trans *trans,
                                            struct btree_iter *iter,
                                            struct bpos end)
 {
-       if (!btree_node_type_is_extents(iter->btree_id)) {
+       if (!btree_id_is_extents(iter->btree_id)) {
                return __bch2_check_discard_freespace_key(trans, iter);
        } else {
                int ret;